diff -uNr -x CVS -x configure -x aclocal.m4 -x Makefile.in kawa.orig/ChangeLog kawa/ChangeLog --- kawa.orig/ChangeLog 2005-01-16 14:34:50.000000000 -0500 +++ kawa/ChangeLog 2005-01-18 23:32:00.067865724 -0500 @@ -1,3 +1,9 @@ +2005-01-18 C. Brian Jones + + * configure.in: added BYTECODE_VERSION + * Makefile.am: added targets for bytecode.jar, install-bytecode-jar + * gnu/bytecode/jar-manifest: new file + 2005-01-16 Per Bothner * kawa/standard/require.java (makeDeclInModule): Clear the value diff -uNr -x CVS -x configure -x aclocal.m4 -x Makefile.in kawa.orig/configure.in kawa/configure.in --- kawa.orig/configure.in 2005-01-11 01:53:21.000000000 -0500 +++ kawa/configure.in 2005-01-18 22:00:40.118746505 -0500 @@ -136,6 +136,7 @@ esac JEMACS_VERSION=`echo $VERSION | sed -e 's/^1/0/'` +BYTECODE_VERSION=`echo $VERSION | sed -e 's/^1/0/'` pathsep=':' filesep='/' @@ -168,6 +169,7 @@ AC_SUBST(PACKAGE) AC_SUBST(VERSION) AC_SUBST(JEMACS_VERSION) +AC_SUBST(BYTECODE_VERSION) AC_SUBST(SHELL) Make_rules="$srcdir/Make-rules" AC_SUBST_FILE(Make_rules) diff -uNr -x CVS -x configure -x aclocal.m4 -x Makefile.in kawa.orig/gnu/bytecode/jar-manifest kawa/gnu/bytecode/jar-manifest --- kawa.orig/gnu/bytecode/jar-manifest 1969-12-31 19:00:00.000000000 -0500 +++ kawa/gnu/bytecode/jar-manifest 2005-01-18 22:21:17.129156875 -0500 @@ -0,0 +1 @@ +Main-Class: gnu.bytecode.dump diff -uNr -x CVS -x configure -x aclocal.m4 -x Makefile.in kawa.orig/Makefile.am kawa/Makefile.am --- kawa.orig/Makefile.am 2005-01-10 17:21:24.000000000 -0500 +++ kawa/Makefile.am 2005-01-19 00:09:21.561535398 -0500 @@ -98,6 +98,11 @@ `find . -name '*.class' -print` \ && cd .. && rm -rf tmpdir address@hidden@.jar: ./gnu/bytecode/java-classes.stamp + $(JAR) cmf $(srcdir)/gnu/bytecode/jar-manifest \ + address@hidden@.jar \ + `find gnu/bytecode -name '*.class' -print` + address@hidden@-src.zip: address@hidden@.tar.gz mkdir zip-temp cd zip-temp ;\ @@ -109,6 +114,7 @@ kawa.jar: address@hidden@.jar kawa-src.zip: address@hidden@-src.zip jemacs.jar: address@hidden@.jar +bytecode.jar: address@hidden@.jar EXTRA_DIST = debian/control debian/rules debian/changelog debian/dirs \ config.guess config.sub install-sh ./mkinstalldirs \ @@ -161,11 +167,23 @@ cd $(DESTDIR)$(javadir) && rm -f kawa.jar \ && $(LN_S) address@hidden@.jar kawa.jar +install-bytecode-jar: address@hidden@.jar + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(javadir) + $(INSTALL_DATA) address@hidden@.jar \ + $(DESTDIR)$(javadir)/address@hidden@.jar + cd $(DESTDIR)$(javadir) && rm -f bytecode.jar \ + && $(LN_S) address@hidden@.jar bytecode.jar + uninstall-local: uninstall-jar uninstall-jar: rm -f $(DESTDIR)$(javadir)/address@hidden@.jar \ $(DESTDIR)$(javadir)/kawa.jar +uninstall-bytecode-jar: + rm -f $(DESTDIR)$(javadir)/address@hidden@.jar \ + $(DESTDIR)$(javadir)/bytecode.jar + kawa/Version.java: $(srcdir)/kawa/Version.java.in $(srcdir)/configure.in sed -e 's|VERSION|@VERSION@|' <$(srcdir)/kawa/Version.java.in >$@ @@ -212,4 +230,4 @@ echo 5 >$(srcdir)/selected-java-source distall: distcheck address@hidden@.jar kawa-doc-$(VERSION).tar.gz \ - address@hidden@-src.zip jemacs.jar + address@hidden@-src.zip address@hidden@.jar address@hidden@.jar