[kaffe] CVS kaffe (robilad): fix for #30

[Kaffe CVS]

PatchSet 7160 
Date: 2006/03/23 01:33:17
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fix for #30

2006-03-22  Dalibor Topic  <robilad at kaffe.org>

        Fix for #30.

        * libraries/javalib/Makefile.am.in: (SUBDIRS) Reordered to
        first copy glibj.zip to classpath subdirectory, if necessary,
        before descending into it.

        * libraries/javalib/external/classpath/tools/Makefile.am: Fixed the compiler
        calls to use glibj.zip.

Members: 
	ChangeLog:1.4678->1.4679 
	libraries/javalib/Makefile.am:1.424->1.425 
	libraries/javalib/Makefile.am.in:1.61->1.62 
	libraries/javalib/Makefile.in:1.530->1.531 
	libraries/javalib/external/classpath/tools/Makefile.am:1.2->1.3 
	libraries/javalib/external/classpath/tools/Makefile.in:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4678 kaffe/ChangeLog:1.4679
--- kaffe/ChangeLog:1.4678	Tue Mar 21 23:15:42 2006
+++ kaffe/ChangeLog	Thu Mar 23 01:33:17 2006
@@ -1,5 +1,16 @@
 2006-03-22  Dalibor Topic  <robilad at kaffe.org>
 
+	Fix for #30.
+
+	* libraries/javalib/Makefile.am.in: (SUBDIRS) Reordered to
+	first copy glibj.zip to classpath subdirectory, if necessary,
+	before descending into it.
+
+	* libraries/javalib/external/classpath/tools/Makefile.am: Fixed the compiler
+	calls to use glibj.zip.
+
+2006-03-22  Dalibor Topic  <robilad at kaffe.org>
+
 	* Resynchronized GNU Classpath.
 
 2006-03-21  Dalibor Topic  <robilad at kaffe.org>
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.424 kaffe/libraries/javalib/Makefile.am:1.425
--- kaffe/libraries/javalib/Makefile.am:1.424	Tue Mar 21 23:15:50 2006
+++ kaffe/libraries/javalib/Makefile.am	Thu Mar 23 01:33:25 2006
@@ -37,7 +37,7 @@
 clean-local:
 	rm -rf stamp-glibj glibj.zip
 
-SUBDIRS= external/classpath . $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
+SUBDIRS= . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
 
 jrelib_DATA= \
 	     logging.properties \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.61 kaffe/libraries/javalib/Makefile.am.in:1.62
--- kaffe/libraries/javalib/Makefile.am.in:1.61	Sat Jan  7 05:33:05 2006
+++ kaffe/libraries/javalib/Makefile.am.in	Thu Mar 23 01:33:27 2006
@@ -37,7 +37,7 @@
 clean-local:
 	rm -rf stamp-glibj glibj.zip
 
-SUBDIRS= external/classpath . $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
+SUBDIRS= . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
 
 jrelib_DATA= \
 	     logging.properties \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.530 kaffe/libraries/javalib/Makefile.in:1.531
--- kaffe/libraries/javalib/Makefile.in:1.530	Tue Mar 21 23:15:51 2006
+++ kaffe/libraries/javalib/Makefile.in	Thu Mar 23 01:33:27 2006
@@ -84,7 +84,7 @@
 DATA = $(jrelib_DATA)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = external/classpath . awt-implementations gmp-math
+DIST_SUBDIRS = . external/classpath awt-implementations gmp-math
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -369,7 +369,7 @@
 # to build the native libraries as well.
 @COND_PURE_JAVA_MATH_FALSE at MAYBE_GMP_JAVA_MATH = gmp-math
 @USE_PRECOMPILED_RT_JAR_TRUE at MAYBE_GLIBJ_ZIP = glibj.zip
-SUBDIRS = external/classpath . $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
+SUBDIRS = . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
 jrelib_DATA = \
 	     logging.properties \
 	     $(MAYBE_GLIBJ_ZIP)
Index: kaffe/libraries/javalib/external/classpath/tools/Makefile.am
diff -u kaffe/libraries/javalib/external/classpath/tools/Makefile.am:1.2 kaffe/libraries/javalib/external/classpath/tools/Makefile.am:1.3
--- kaffe/libraries/javalib/external/classpath/tools/Makefile.am:1.2	Tue Mar 21 23:17:15 2006
+++ kaffe/libraries/javalib/external/classpath/tools/Makefile.am	Thu Mar 23 01:33:31 2006
@@ -2,16 +2,16 @@
 
 # Setup the compiler to use the GNU Classpath library we just build
 if FOUND_GCJ
-JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
+JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib/glibj.zip' --classpath . -C
 else
 if FOUND_JIKES
-JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:.
+JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib/glibj.zip:.
 else
 if FOUND_GCJX
-JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib:.
+JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib/glibj.zip:.
 else
 if FOUND_ECJ
-JCOMPILER = $(ECJ) -bootclasspath '$(top_builddir)/lib' -classpath .
+JCOMPILER = $(ECJ) -bootclasspath '$(top_builddir)/lib/glibj.zip' -classpath .
 else
 error dunno how to setup the JCOMPILER and compile
 endif
Index: kaffe/libraries/javalib/external/classpath/tools/Makefile.in
diff -u kaffe/libraries/javalib/external/classpath/tools/Makefile.in:1.3 kaffe/libraries/javalib/external/classpath/tools/Makefile.in:1.4
--- kaffe/libraries/javalib/external/classpath/tools/Makefile.in:1.3	Tue Mar 21 23:17:15 2006
+++ kaffe/libraries/javalib/external/classpath/tools/Makefile.in	Thu Mar 23 01:33:31 2006
@@ -268,12 +268,12 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 vm_classes = @vm_classes@
- at FOUND_ECJ_TRUE@@FOUND_GCJX_FALSE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE at JCOMPILER = $(ECJ) -bootclasspath '$(top_builddir)/lib' -classpath .
- at FOUND_GCJX_TRUE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE at JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib:.
- at FOUND_GCJ_FALSE@@FOUND_JIKES_TRUE at JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:.
+ at FOUND_ECJ_TRUE@@FOUND_GCJX_FALSE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE at JCOMPILER = $(ECJ) -bootclasspath '$(top_builddir)/lib/glibj.zip' -classpath .
+ at FOUND_GCJX_TRUE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE at JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib/glibj.zip:.
+ at FOUND_GCJ_FALSE@@FOUND_JIKES_TRUE at JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib/glibj.zip:.
 
 # Setup the compiler to use the GNU Classpath library we just build
- at FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
+ at FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib/glibj.zip' --classpath . -C
 
 # All our example java source files
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java