[kaffe] CVS kaffe (robilad): cleaned up bootstrapping build

Kaffe CVS cvs-commits at kaffe.org
Wed Feb 2 19:43:46 PST 2005 

PatchSet 5964 
Date: 2005/02/03 03:38:53
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned up bootstrapping build

2005-02-03  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/Makefile.am.in,
        libraries/javalib/awt-implementations/kaffe/Makefile.am,
        libraries/javalib/gmp-math/Makefile.am,
        tools/gjdoc/javalib/Makefile.am:
        Removed bootstrap parts for using kaffe's jar on
        freshly bootstrapped kaffe instead of zip.

        * libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in,
        libraries/javalib/awt-implementations/kaffe/Makefile.in,
        libraries/javalib/gmp-math/Makefile.in,
        tools/gjdoc/javalib/Makefile.in:
        Regenerated.

Members: 
	ChangeLog:1.3503->1.3504 
	libraries/javalib/Makefile.am:1.305->1.306 
	libraries/javalib/Makefile.am.in:1.33->1.34 
	libraries/javalib/Makefile.in:1.389->1.390 
	libraries/javalib/awt-implementations/kaffe/Makefile.am:1.2->1.3 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.17->1.18 
	libraries/javalib/gmp-math/Makefile.am:1.1->1.2 
	libraries/javalib/gmp-math/Makefile.in:1.19->1.20 
	tools/gjdoc/javalib/Makefile.am:1.11->1.12 
	tools/gjdoc/javalib/Makefile.in:1.41->1.42 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3503 kaffe/ChangeLog:1.3504
--- kaffe/ChangeLog:1.3503	Wed Feb  2 23:16:09 2005
+++ kaffe/ChangeLog	Thu Feb  3 03:38:53 2005
@@ -1,3 +1,19 @@
+2005-02-03  Dalibor Topic  <robilad at kaffe.org>
+
+        * libraries/javalib/Makefile.am.in,
+        libraries/javalib/awt-implementations/kaffe/Makefile.am,
+        libraries/javalib/gmp-math/Makefile.am,
+        tools/gjdoc/javalib/Makefile.am:
+	Removed bootstrap parts for using kaffe's jar on
+	freshly bootstrapped kaffe instead of zip.
+
+        * libraries/javalib/Makefile.am,
+        libraries/javalib/Makefile.in,
+        libraries/javalib/awt-implementations/kaffe/Makefile.in,
+        libraries/javalib/gmp-math/Makefile.in,
+        tools/gjdoc/javalib/Makefile.in:
+	Regenerated.
+
 2005-02-02  Dalibor Topic  <robilad at kaffe.org>
 
         * libraries/javalib/gnu/regexp/RE.java,
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.305 kaffe/libraries/javalib/Makefile.am:1.306
--- kaffe/libraries/javalib/Makefile.am:1.305	Wed Feb  2 01:41:04 2005
+++ kaffe/libraries/javalib/Makefile.am	Thu Feb  3 03:38:56 2005
@@ -42,12 +42,6 @@
 
 SRCDIRS = com gnu java javax kaffe org
 
-## taken from top level Makefile.am
-JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
-KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/:$(top_builddir)/libraries/clib/security/:$(top_builddir)/libraries/clib/classpath/
-BOOTCLASSPATH=$(LIBDIR):$(srcdir)/Klasses.jar.bootstrap
-JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
-
 installed_properties = \
 	logging.properties
 
@@ -4836,32 +4830,18 @@
 bootstrap: $(srcdir)/Klasses.jar.bootstrap
 $(srcdir)/Klasses.jar.bootstrap: rt.jar
 	rm -f $@.new
-if HAVE_ZIP
 	(cd $(LIBDIR) && $(ZIP) -DX -r $(CURDIR)/$@.new `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist`)
-else
-	$(JAR) -cf $@.new -C $(LIBDIR) `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist`
-endif
 	mv $@.new $@
 
 .PHONY: bootstrap
 $(srcdir)/Klasses.jar.bootstrap: bootstrap.classlist
 
-if HAVE_ZIP
 JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
 JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS))
 JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
 JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(serialized_converters))
 JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
 JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
-
-else
-JAR_CMD1 = $(JAR) -cf $@.new -C $(LIBDIR) $(SRCDIRS)
-JAR_CMD2 = $(JAR) -uf $@.new -C $(srcdir) META-INF/
-JAR_CMD3 = $(JAR) -uf $@.new -C $(srcdir) $(gnu_regexp_message_bundles)
-JAR_CMD4 = $(JAR) -uf $@.new -C $(srcdir) $(serialized_converters)
-JAR_CMD5 = $(JAR) -uf $@.new -C $(srcdir) $(gnu_getopt_message_bundles)
-JAR_CMD6 = $(JAR) -uf $@.new -C $(srcdir) $(classpath_resources)
-endif
 
 .PHONY: jar-classes
 if USE_PRECOMPILED_RT_JAR
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.33 kaffe/libraries/javalib/Makefile.am.in:1.34
--- kaffe/libraries/javalib/Makefile.am.in:1.33	Mon Jan 24 10:13:07 2005
+++ kaffe/libraries/javalib/Makefile.am.in	Thu Feb  3 03:38:57 2005
@@ -42,12 +42,6 @@
 
 SRCDIRS = com gnu java javax kaffe org
 
-## taken from top level Makefile.am
-JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
-KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/:$(top_builddir)/libraries/clib/security/:$(top_builddir)/libraries/clib/classpath/
-BOOTCLASSPATH=$(LIBDIR):$(srcdir)/Klasses.jar.bootstrap
-JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
-
 installed_properties = \
 	logging.properties
 
@@ -209,32 +203,18 @@
 bootstrap: $(srcdir)/Klasses.jar.bootstrap
 $(srcdir)/Klasses.jar.bootstrap: rt.jar
 	rm -f $@.new
-if HAVE_ZIP
 	(cd $(LIBDIR) && $(ZIP) -DX -r $(CURDIR)/$@.new `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist`)
-else
-	$(JAR) -cf $@.new -C $(LIBDIR) `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist`
-endif
 	mv $@.new $@
 
 .PHONY: bootstrap
 $(srcdir)/Klasses.jar.bootstrap: bootstrap.classlist
 
-if HAVE_ZIP
 JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
 JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS))
 JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
 JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(serialized_converters))
 JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
 JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
-
-else
-JAR_CMD1 = $(JAR) -cf $@.new -C $(LIBDIR) $(SRCDIRS)
-JAR_CMD2 = $(JAR) -uf $@.new -C $(srcdir) META-INF/
-JAR_CMD3 = $(JAR) -uf $@.new -C $(srcdir) $(gnu_regexp_message_bundles)
-JAR_CMD4 = $(JAR) -uf $@.new -C $(srcdir) $(serialized_converters)
-JAR_CMD5 = $(JAR) -uf $@.new -C $(srcdir) $(gnu_getopt_message_bundles)
-JAR_CMD6 = $(JAR) -uf $@.new -C $(srcdir) $(classpath_resources)
-endif
 
 .PHONY: jar-classes
 if USE_PRECOMPILED_RT_JAR
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.389 kaffe/libraries/javalib/Makefile.in:1.390
--- kaffe/libraries/javalib/Makefile.in:1.389	Wed Feb  2 01:41:05 2005
+++ kaffe/libraries/javalib/Makefile.in	Thu Feb  3 03:38:57 2005
@@ -219,7 +219,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
-JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
+JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
 JAVA_LIBS = @JAVA_LIBS@
@@ -397,9 +397,6 @@
 @COND_PURE_JAVA_MATH_FALSE at MAYBE_GMP_JAVA_MATH = gmp-math
 SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
 SRCDIRS = com gnu java javax kaffe org
-KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/:$(top_builddir)/libraries/clib/security/:$(top_builddir)/libraries/clib/classpath/
-BOOTCLASSPATH = $(LIBDIR):$(srcdir)/Klasses.jar.bootstrap
-JAR = BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
 installed_properties = \
 	logging.properties
 
@@ -5432,18 +5429,12 @@
 
 LIBDIR = lib
 rebuildLib = ./rebuildLib
- at HAVE_ZIP_FALSE@JAR_CMD1 = $(JAR) -cf $@.new -C $(LIBDIR) $(SRCDIRS)
- at HAVE_ZIP_TRUE@JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
- at HAVE_ZIP_FALSE@JAR_CMD2 = $(JAR) -uf $@.new -C $(srcdir) META-INF/
- at HAVE_ZIP_TRUE@JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS))
- at HAVE_ZIP_FALSE@JAR_CMD3 = $(JAR) -uf $@.new -C $(srcdir) $(gnu_regexp_message_bundles)
- at HAVE_ZIP_TRUE@JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
- at HAVE_ZIP_FALSE@JAR_CMD4 = $(JAR) -uf $@.new -C $(srcdir) $(serialized_converters)
- at HAVE_ZIP_TRUE@JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(serialized_converters))
- at HAVE_ZIP_FALSE@JAR_CMD5 = $(JAR) -uf $@.new -C $(srcdir) $(gnu_getopt_message_bundles)
- at HAVE_ZIP_TRUE@JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
- at HAVE_ZIP_FALSE@JAR_CMD6 = $(JAR) -uf $@.new -C $(srcdir) $(classpath_resources)
- at HAVE_ZIP_TRUE@JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
+JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS))
+JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
+JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(serialized_converters))
+JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
+JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
 all: all-recursive
 
 .SUFFIXES:
@@ -5793,8 +5784,7 @@
 bootstrap: $(srcdir)/Klasses.jar.bootstrap
 $(srcdir)/Klasses.jar.bootstrap: rt.jar
 	rm -f $@.new
- at HAVE_ZIP_TRUE@	(cd $(LIBDIR) && $(ZIP) -DX -r $(CURDIR)/$@.new `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist`)
- at HAVE_ZIP_FALSE@	$(JAR) -cf $@.new -C $(LIBDIR) `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist`
+	(cd $(LIBDIR) && $(ZIP) -DX -r $(CURDIR)/$@.new `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist`)
 	mv $@.new $@
 
 .PHONY: bootstrap
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.2 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.3
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.2	Thu Jul 29 14:25:14 2004
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am	Thu Feb  3 03:38:58 2005
@@ -7,12 +7,6 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file.
 
-## taken from top level Makefile.am
-JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
-KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
-BOOTCLASSPATH=$(top_builddir)/libraries/javalib/rt.jar
-JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
-
 CLASSFILE = kaffeawt.jar
 SRCDIRS = kaffe java
 
@@ -419,11 +413,7 @@
 	$(jrelib_DATA) \
 	$(kaffeawt_jar_SRCS)
 
-if HAVE_ZIP
 JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE) $(SRCDIRS))
-else
-JAR_CMD1 = $(JAR) -cvf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS)
-endif
 
 LIBDIR = lib
 
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.17 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.18
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.17	Fri Jan 28 15:31:43 2005
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in	Thu Feb  3 03:38:58 2005
@@ -195,7 +195,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
-JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
+JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
 JAVA_LIBS = @JAVA_LIBS@
@@ -362,9 +362,6 @@
 toolslibdir = @toolslibdir@
 uudecode = @uudecode@
 with_engine = @with_engine@
-KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
-BOOTCLASSPATH = $(top_builddir)/libraries/javalib/rt.jar
-JAR = BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
 CLASSFILE = kaffeawt.jar
 SRCDIRS = kaffe java
 jrelib_DATA = $(CLASSFILE)
@@ -784,8 +781,7 @@
 	$(jrelib_DATA) \
 	$(kaffeawt_jar_SRCS)
 
- at HAVE_ZIP_FALSE@JAR_CMD1 = $(JAR) -cvf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS)
- at HAVE_ZIP_TRUE@JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE) $(SRCDIRS))
+JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE) $(SRCDIRS))
 LIBDIR = lib
 rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
 Klasses_jar = $(top_builddir)/libraries/javalib/rt.jar
Index: kaffe/libraries/javalib/gmp-math/Makefile.am
diff -u kaffe/libraries/javalib/gmp-math/Makefile.am:1.1 kaffe/libraries/javalib/gmp-math/Makefile.am:1.2
--- kaffe/libraries/javalib/gmp-math/Makefile.am:1.1	Sun Jul 18 15:28:10 2004
+++ kaffe/libraries/javalib/gmp-math/Makefile.am	Thu Feb  3 03:38:58 2005
@@ -7,12 +7,6 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file.
 
-## taken from top level Makefile.am
-JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
-KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
-BOOTCLASSPATH=$(top_builddir)/libraries/javalib/rt.jar
-JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
-
 CLASSFILE = gmpjavamath.jar
 SRCDIRS = java
 
@@ -30,11 +24,7 @@
 	$(jrelib_DATA) \
 	$(gmpjavamath_jar_SRCS)
 
-if HAVE_ZIP
 JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE) $(SRCDIRS))
-else
-JAR_CMD1 = $(JAR) -cvf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS)
-endif
 
 LIBDIR = lib
 
Index: kaffe/libraries/javalib/gmp-math/Makefile.in
diff -u kaffe/libraries/javalib/gmp-math/Makefile.in:1.19 kaffe/libraries/javalib/gmp-math/Makefile.in:1.20
--- kaffe/libraries/javalib/gmp-math/Makefile.in:1.19	Fri Jan 28 15:31:44 2005
+++ kaffe/libraries/javalib/gmp-math/Makefile.in	Thu Feb  3 03:38:58 2005
@@ -195,7 +195,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
-JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
+JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
 JAVA_LIBS = @JAVA_LIBS@
@@ -362,9 +362,6 @@
 toolslibdir = @toolslibdir@
 uudecode = @uudecode@
 with_engine = @with_engine@
-KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
-BOOTCLASSPATH = $(top_builddir)/libraries/javalib/rt.jar
-JAR = BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
 CLASSFILE = gmpjavamath.jar
 SRCDIRS = java
 jrelib_DATA = $(CLASSFILE)
@@ -379,8 +376,7 @@
 	$(jrelib_DATA) \
 	$(gmpjavamath_jar_SRCS)
 
- at HAVE_ZIP_FALSE@JAR_CMD1 = $(JAR) -cvf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS)
- at HAVE_ZIP_TRUE@JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE) $(SRCDIRS))
+JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE) $(SRCDIRS))
 LIBDIR = lib
 rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
 Klasses_jar = $(top_srcdir)/libraries/javalib/rt.jar
Index: kaffe/tools/gjdoc/javalib/Makefile.am
diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.11 kaffe/tools/gjdoc/javalib/Makefile.am:1.12
--- kaffe/tools/gjdoc/javalib/Makefile.am:1.11	Sun Jan 23 22:34:47 2005
+++ kaffe/tools/gjdoc/javalib/Makefile.am	Thu Feb  3 03:38:59 2005
@@ -7,12 +7,6 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file.
 
-## taken from top level Makefile.am
-JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
-KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
-BOOTCLASSPATH=$(top_builddir)/libraries/javalib/rt.jar
-JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
-
 CLASSFILE = gjdoc.jar
 SRCDIRS = com gnu
 
@@ -253,13 +247,8 @@
 	$(gjdoc_jar_SRCS) \
 	$(gjdoc_ressources)
 
-if HAVE_ZIP
 JAR_CMD1 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new $(SRCDIRS))
 JAR_CMD2 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gjdoc_ressources))
-else
-JAR_CMD1 = $(JAR) -cf $@.new -C $(LIBDIR) $(SRCDIRS)
-JAR_CMD2 = $(JAR) -uf $@.new -C $(srcdir) $(gjdoc_ressources)
-endif
 
 LIBDIR = lib
 
@@ -279,7 +268,7 @@
 	rm -rf $(LIBDIR)
 	mkdir $(LIBDIR)
 	echo $(SHELL) $(rebuildLib)
-	CLASSPATH=$(Klasses_jar):$(ANTLR_JAR) BOOTCLASSPATH=$(top_srcdir)/libraries/javalib/Klasses.jar.bootstrap:$(ANTLR_JAR) $(SHELL) $(rebuildLib) $(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
+	CLASSPATH=$(Klasses_jar):$(ANTLR_JAR) BOOTCLASSPATH=$(top_srcdir)/libraries/javalib/rt.jar:$(ANTLR_JAR) $(SHELL) $(rebuildLib) $(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
 	echo timestamp > $(LIBDIR)/stamp
 
 .PHONY: jar-classes
Index: kaffe/tools/gjdoc/javalib/Makefile.in
diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.41 kaffe/tools/gjdoc/javalib/Makefile.in:1.42
--- kaffe/tools/gjdoc/javalib/Makefile.in:1.41	Fri Jan 28 15:31:50 2005
+++ kaffe/tools/gjdoc/javalib/Makefile.in	Thu Feb  3 03:38:59 2005
@@ -195,7 +195,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
-JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
+JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
 JAVA_LIBS = @JAVA_LIBS@
@@ -362,9 +362,6 @@
 toolslibdir = @toolslibdir@
 uudecode = @uudecode@
 with_engine = @with_engine@
-KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
-BOOTCLASSPATH = $(top_builddir)/libraries/javalib/rt.jar
-JAR = BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
 CLASSFILE = gjdoc.jar
 SRCDIRS = com gnu
 toolslib_DATA = $(CLASSFILE) $(ANTLR_JAR)
@@ -600,10 +597,8 @@
 	$(gjdoc_jar_SRCS) \
 	$(gjdoc_ressources)
 
- at HAVE_ZIP_FALSE@JAR_CMD1 = $(JAR) -cf $@.new -C $(LIBDIR) $(SRCDIRS)
- at HAVE_ZIP_TRUE@JAR_CMD1 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new $(SRCDIRS))
- at HAVE_ZIP_FALSE@JAR_CMD2 = $(JAR) -uf $@.new -C $(srcdir) $(gjdoc_ressources)
- at HAVE_ZIP_TRUE@JAR_CMD2 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gjdoc_ressources))
+JAR_CMD1 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new $(SRCDIRS))
+JAR_CMD2 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gjdoc_ressources))
 LIBDIR = lib
 rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
 Klasses_jar = $(top_srcdir)/libraries/javalib/rt.jar
@@ -802,7 +797,7 @@
 	rm -rf $(LIBDIR)
 	mkdir $(LIBDIR)
 	echo $(SHELL) $(rebuildLib)
-	CLASSPATH=$(Klasses_jar):$(ANTLR_JAR) BOOTCLASSPATH=$(top_srcdir)/libraries/javalib/Klasses.jar.bootstrap:$(ANTLR_JAR) $(SHELL) $(rebuildLib) $(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
+	CLASSPATH=$(Klasses_jar):$(ANTLR_JAR) BOOTCLASSPATH=$(top_srcdir)/libraries/javalib/rt.jar:$(ANTLR_JAR) $(SHELL) $(rebuildLib) $(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
 	echo timestamp > $(LIBDIR)/stamp
 
 .PHONY: jar-classes

More information about the kaffe mailing list