[kaffe] CVS kaffe (robilad): Replace JAVA_COMPILER with JAVAC

Kaffe CVS cvs-commits at kaffe.org
Sun Nov 11 13:58:01 PST 2007


PatchSet 7602 
Date: 2007/11/11 21:56:34
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Replace JAVA_COMPILER with JAVAC

2007-11-11  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac,
        test/regression/TestScript.in,
        test/regression/compile_time/CompileScript.in,
        test/regression/compiler/CompileScript.in,
        test/regression/run_time/CompileScript.in: Replace JAVA_COMPILER with JAVAC.

        * libraries/javalib/awt-implementations/kaffe/Makefile.am,
        libraries/javalib/dnsjava/Makefile.am,
        libraries/javalib/gmp-math/Makefile.am,
        libraries/javalib/gnu-inet/Makefile.am,
        libraries/javalib/tritonus-sound/Makefile.am,
        libraries/javalib/vmspecific/Makefile.am,
        libraries/javalib/zlib-zip/Makefile.am,
        test/internal/Makefile.am,
        test/jni/Makefile.am,
        tools/gjdoc/javalib/Makefile.am,
        tools/javatools/Makefile.am: Removed unnecessary JAVAC assignment.

        * test/regression/InputStreamTest.java: Fix compilation again.

Members: 
	ChangeLog:1.5099->1.5100 
	Makefile.in:1.285->1.286 
	configure:1.600->1.601 
	configure.ac:1.272->1.273 
	config/Makefile.in:1.240->1.241 
	include/Makefile.in:1.302->1.303 
	kaffe/Makefile.in:1.190->1.191 
	kaffe/jvmpi/Makefile.in:1.115->1.116 
	kaffe/kaffe/Makefile.in:1.214->1.215 
	kaffe/kaffeh/Makefile.in:1.195->1.196 
	kaffe/kaffevm/Makefile.in:1.264->1.265 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.78->1.79 
	kaffe/kaffevm/gcj/Makefile.in:1.170->1.171 
	kaffe/kaffevm/intrp/Makefile.in:1.179->1.180 
	kaffe/kaffevm/jit/Makefile.in:1.189->1.190 
	kaffe/kaffevm/jit3/Makefile.in:1.159->1.160 
	kaffe/kaffevm/jni/Makefile.in:1.83->1.84 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.77->1.78 
	kaffe/kaffevm/systems/Makefile.in:1.179->1.180 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.170->1.171 
	kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.34->1.35 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.176->1.177 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.180->1.181 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.156->1.157 
	kaffe/kaffevm/verifier/Makefile.in:1.82->1.83 
	kaffe/man/Makefile.in:1.177->1.178 
	kaffe/scripts/Makefile.in:1.219->1.220 
	kaffe/scripts/bat/Makefile.in:1.170->1.171 
	kaffe/scripts/compat/Makefile.in:1.197->1.198 
	kaffe/xprof/Makefile.in:1.145->1.146 
	libraries/Makefile.in:1.173->1.174 
	libraries/clib/Makefile.in:1.194->1.195 
	libraries/clib/awt/Makefile.in:1.188->1.189 
	libraries/clib/awt/X/Makefile.in:1.183->1.184 
	libraries/clib/awt/nano-X/Makefile.in:1.55->1.56 
	libraries/clib/awt/qt/Makefile.in:1.136->1.137 
	libraries/clib/awt/xynth/Makefile.in:1.11->1.12 
	libraries/clib/management/Makefile.in:1.192->1.193 
	libraries/clib/math/Makefile.in:1.186->1.187 
	libraries/clib/security/Makefile.in:1.158->1.159 
	libraries/clib/sound/Makefile.in:1.82->1.83 
	libraries/clib/sound/alsa/Makefile.in:1.83->1.84 
	libraries/clib/sound/common/Makefile.in:1.82->1.83 
	libraries/clib/sound/esd/Makefile.in:1.83->1.84 
	libraries/clib/zip/Makefile.in:1.191->1.192 
	libraries/javalib/Makefile.in:1.582->1.583 
	libraries/javalib/awt-implementations/Makefile.in:1.67->1.68 
	libraries/javalib/awt-implementations/kaffe/Makefile.am:1.25->1.26 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.87->1.88 
	libraries/javalib/dnsjava/Makefile.am:1.4->1.5 
	libraries/javalib/dnsjava/Makefile.in:1.13->1.14 
	libraries/javalib/gmp-math/Makefile.am:1.12->1.13 
	libraries/javalib/gmp-math/Makefile.in:1.76->1.77 
	libraries/javalib/gnu-inet/Makefile.am:1.2->1.3 
	libraries/javalib/gnu-inet/Makefile.in:1.10->1.11 
	libraries/javalib/tritonus-sound/Makefile.am:1.4->1.5 
	libraries/javalib/tritonus-sound/Makefile.in:1.13->1.14 
	libraries/javalib/vmspecific/Makefile.am:1.10->1.11 
	libraries/javalib/vmspecific/Makefile.in:1.17->1.18 
	libraries/javalib/zlib-zip/Makefile.am:1.5->1.6 
	libraries/javalib/zlib-zip/Makefile.in:1.13->1.14 
	replace/Makefile.in:1.132->1.133 
	test/Makefile.in:1.182->1.183 
	test/internal/Makefile.am:1.35->1.36 
	test/internal/Makefile.in:1.158->1.159 
	test/jni/Makefile.am:1.19->1.20 
	test/jni/Makefile.in:1.88->1.89 
	test/regression/InputStreamTest.java:1.3->1.4 
	test/regression/Makefile.in:1.260->1.261 
	test/regression/TestScript.in:1.53->1.54 
	test/regression/compile_time/CompileScript.in:1.4->1.5 
	test/regression/compile_time/Makefile.in:1.110->1.111 
	test/regression/compiler/CompileScript.in:1.3->1.4 
	test/regression/compiler/Makefile.in:1.94->1.95 
	test/regression/run_time/CompileScript.in:1.3->1.4 
	test/regression/run_time/Makefile.in:1.109->1.110 
	tools/Makefile.in:1.84->1.85 
	tools/gjdoc/Makefile.in:1.83->1.84 
	tools/gjdoc/javalib/Makefile.am:1.26->1.27 
	tools/gjdoc/javalib/Makefile.in:1.101->1.102 
	tools/javatools/Makefile.am:1.5->1.6 
	tools/javatools/Makefile.in:1.40->1.41 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5099 kaffe/ChangeLog:1.5100
--- kaffe/ChangeLog:1.5099	Sun Nov 11 15:46:57 2007
+++ kaffe/ChangeLog	Sun Nov 11 21:56:34 2007
@@ -1,5 +1,27 @@
 2007-11-11  Dalibor Topic  <robilad at kaffe.org>
 
+	* configure.ac,
+	test/regression/TestScript.in,
+	test/regression/compile_time/CompileScript.in,
+	test/regression/compiler/CompileScript.in,
+	test/regression/run_time/CompileScript.in: Replace JAVA_COMPILER with JAVAC.
+
+	* libraries/javalib/awt-implementations/kaffe/Makefile.am,
+	libraries/javalib/dnsjava/Makefile.am,
+	libraries/javalib/gmp-math/Makefile.am,
+	libraries/javalib/gnu-inet/Makefile.am,
+	libraries/javalib/tritonus-sound/Makefile.am,
+	libraries/javalib/vmspecific/Makefile.am,
+	libraries/javalib/zlib-zip/Makefile.am,
+	test/internal/Makefile.am,
+	test/jni/Makefile.am,
+	tools/gjdoc/javalib/Makefile.am,
+	tools/javatools/Makefile.am: Removed unnecessary JAVAC assignment.
+
+	* test/regression/InputStreamTest.java: Fix compilation again.
+
+2007-11-11  Dalibor Topic  <robilad at kaffe.org>
+
 	* test/regression/Bean.java,
 	test/regression/BeanBug.java,
 	test/regression/ClassGC.java,
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.285 kaffe/Makefile.in:1.286
--- kaffe/Makefile.in:1.285	Wed Oct 24 21:25:59 2007
+++ kaffe/Makefile.in	Sun Nov 11 21:56:34 2007
@@ -171,8 +171,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/configure
diff -u kaffe/configure:1.600 kaffe/configure:1.601
--- kaffe/configure:1.600	Wed Oct 24 18:20:44 2007
+++ kaffe/configure	Sun Nov 11 21:56:34 2007
@@ -960,7 +960,7 @@
 CLASSPATH_LIBDIR
 GLIBJ_ZIP
 JIKESPROG
-JAVA_COMPILER
+JAVAC
 JAVA_LIBS
 with_engine
 THREAD_SYSTEM
@@ -26003,9 +26003,9 @@
 if test "${with_ecj+set}" = set; then
   withval=$with_ecj;
             if test x"$withval" = x"yes" ; then
-              JAVA_COMPILER="ecj"
+              JAVAC="ecj"
             else
-              JAVA_COMPILER="$withval"
+              JAVAC="$withval"
             fi
 	    use_ecj=yes
 else
@@ -26091,7 +26091,7 @@
 echo "$as_me: error: No jikes compiler found. Please install jikes version 1.21 or higher." >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
+	JAVAC="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
 esac
 
 
@@ -26103,8 +26103,8 @@
 
 { echo "$as_me:$LINENO: checking which java compiler" >&5
 echo $ECHO_N "checking which java compiler... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $JAVA_COMPILER" >&5
-echo "${ECHO_T}$JAVA_COMPILER" >&6; }
+{ echo "$as_me:$LINENO: result: $JAVAC" >&5
+echo "${ECHO_T}$JAVAC" >&6; }
 
 
 
@@ -26424,7 +26424,7 @@
 
 
 
- if test x"$JAVA_COMPILER" != x""; then
+ if test x"$JAVAC" != x""; then
   HAVE_JAVAC_TRUE=
   HAVE_JAVAC_FALSE='#'
 else
@@ -47755,7 +47755,7 @@
 fi
 
 if test x"$use_ecj" = x"yes"; then
-  ac_configure_args="$ac_configure_args --with-ecj=${JAVA_COMPILER}"
+  ac_configure_args="$ac_configure_args --with-ecj=${JAVAC}"
 fi
 
 if test x"$enable_native_awt" = x"no"; then
@@ -49208,7 +49208,7 @@
 CLASSPATH_LIBDIR!$CLASSPATH_LIBDIR$ac_delim
 GLIBJ_ZIP!$GLIBJ_ZIP$ac_delim
 JIKESPROG!$JIKESPROG$ac_delim
-JAVA_COMPILER!$JAVA_COMPILER$ac_delim
+JAVAC!$JAVAC$ac_delim
 JAVA_LIBS!$JAVA_LIBS$ac_delim
 with_engine!$with_engine$ac_delim
 THREAD_SYSTEM!$THREAD_SYSTEM$ac_delim
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.272 kaffe/configure.ac:1.273
--- kaffe/configure.ac:1.272	Tue Oct 23 13:12:58 2007
+++ kaffe/configure.ac	Sun Nov 11 21:56:35 2007
@@ -728,9 +728,9 @@
 			   [Define to use ECJ as the java compiler instead of jikes]),
 	   [
             if test x"$withval" = x"yes" ; then
-              JAVA_COMPILER="ecj" 
+              JAVAC="ecj" 
             else 
-              JAVA_COMPILER="$withval" 
+              JAVAC="$withval" 
             fi
 	    use_ecj=yes],
 	   [use_ecj=no])
@@ -770,7 +770,7 @@
 	if test x"$JIKESPROG" = x"" ; then
 	  AC_MSG_ERROR([No jikes compiler found. Please install jikes version 1.21 or higher.])
 	fi
-	JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
+	JAVAC="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
 esac
 
 dnl =========================================================================
@@ -782,9 +782,9 @@
 fi
 
 AC_MSG_CHECKING([which java compiler])
-AC_MSG_RESULT($JAVA_COMPILER)
+AC_MSG_RESULT($JAVAC)
 
-AC_SUBST(JAVA_COMPILER)
+AC_SUBST(JAVAC)
 
 dnl =========================================================================
 dnl Look for trampoline code if in JIT mode
@@ -842,7 +842,7 @@
 fi
 AC_CHECK_PROG(JASMIN, jasmin, jasmin)
 
-AM_CONDITIONAL(HAVE_JAVAC, test x"$JAVA_COMPILER" != x"")
+AM_CONDITIONAL(HAVE_JAVAC, test x"$JAVAC" != x"")
 AM_CONDITIONAL(HAVE_MKTEMP, test x"$MKTEMP" != x"")
 AM_CONDITIONAL(HAVE_JASMIN, test x"$JASMIN" != x"")
 
@@ -2286,7 +2286,7 @@
 fi
 
 if test x"$use_ecj" = x"yes"; then
-  ac_configure_args="$ac_configure_args --with-ecj=${JAVA_COMPILER}"
+  ac_configure_args="$ac_configure_args --with-ecj=${JAVAC}"
 fi
 
 if test x"$enable_native_awt" = x"no"; then
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.240 kaffe/config/Makefile.in:1.241
--- kaffe/config/Makefile.in:1.240	Mon Oct  8 12:39:44 2007
+++ kaffe/config/Makefile.in	Sun Nov 11 21:56:35 2007
@@ -141,8 +141,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.302 kaffe/include/Makefile.in:1.303
--- kaffe/include/Makefile.in:1.302	Wed Oct 24 18:20:45 2007
+++ kaffe/include/Makefile.in	Sun Nov 11 21:56:35 2007
@@ -156,8 +156,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.190 kaffe/kaffe/Makefile.in:1.191
--- kaffe/kaffe/Makefile.in:1.190	Tue Aug  7 01:44:48 2007
+++ kaffe/kaffe/Makefile.in	Sun Nov 11 21:56:35 2007
@@ -145,8 +145,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.115 kaffe/kaffe/jvmpi/Makefile.in:1.116
--- kaffe/kaffe/jvmpi/Makefile.in:1.115	Tue Aug  7 01:44:48 2007
+++ kaffe/kaffe/jvmpi/Makefile.in	Sun Nov 11 21:56:35 2007
@@ -156,8 +156,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.214 kaffe/kaffe/kaffe/Makefile.in:1.215
--- kaffe/kaffe/kaffe/Makefile.in:1.214	Tue Aug  7 01:44:48 2007
+++ kaffe/kaffe/kaffe/Makefile.in	Sun Nov 11 21:56:35 2007
@@ -157,8 +157,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.195 kaffe/kaffe/kaffeh/Makefile.in:1.196
--- kaffe/kaffe/kaffeh/Makefile.in:1.195	Tue Aug  7 01:44:48 2007
+++ kaffe/kaffe/kaffeh/Makefile.in	Sun Nov 11 21:56:36 2007
@@ -163,8 +163,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.264 kaffe/kaffe/kaffevm/Makefile.in:1.265
--- kaffe/kaffe/kaffevm/Makefile.in:1.264	Tue Oct 23 11:10:30 2007
+++ kaffe/kaffe/kaffevm/Makefile.in	Sun Nov 11 21:56:36 2007
@@ -219,8 +219,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.78 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.79
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.78	Mon Oct  1 14:51:19 2007
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in	Sun Nov 11 21:56:39 2007
@@ -162,8 +162,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.170 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.171
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.170	Tue Aug  7 01:44:49 2007
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in	Sun Nov 11 21:56:39 2007
@@ -162,8 +162,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.179 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.180
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.179	Tue Aug  7 01:44:49 2007
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -155,8 +155,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.189 kaffe/kaffe/kaffevm/jit/Makefile.in:1.190
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.189	Tue Aug  7 01:44:50 2007
+++ kaffe/kaffe/kaffevm/jit/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -163,8 +163,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.159 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.160
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.159	Tue Aug  7 01:44:50 2007
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -163,8 +163,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.83 kaffe/kaffe/kaffevm/jni/Makefile.in:1.84
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.83	Tue Aug  7 01:44:50 2007
+++ kaffe/kaffe/kaffevm/jni/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -159,8 +159,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.77 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.78
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.77	Mon Oct  1 14:51:19 2007
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -155,8 +155,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.179 kaffe/kaffe/kaffevm/systems/Makefile.in:1.180
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.179	Tue Aug  7 01:44:51 2007
+++ kaffe/kaffe/kaffevm/systems/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -144,8 +144,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.170 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.171
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.170	Tue Aug  7 01:44:52 2007
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -154,8 +154,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.34 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.35
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.34	Mon Oct  1 15:37:13 2007
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in	Sun Nov 11 21:56:40 2007
@@ -149,8 +149,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.176 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.177
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.176	Tue Aug  7 01:44:52 2007
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in	Sun Nov 11 21:56:41 2007
@@ -154,8 +154,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.180 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.181
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.180	Tue Aug  7 01:44:52 2007
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in	Sun Nov 11 21:56:42 2007
@@ -155,8 +155,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.156 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.157
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.156	Tue Aug  7 01:44:52 2007
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -160,8 +160,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.82 kaffe/kaffe/kaffevm/verifier/Makefile.in:1.83
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.82	Tue Aug  7 01:44:53 2007
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -156,8 +156,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.177 kaffe/kaffe/man/Makefile.in:1.178
--- kaffe/kaffe/man/Makefile.in:1.177	Tue Aug  7 01:44:53 2007
+++ kaffe/kaffe/man/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -138,8 +138,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.219 kaffe/kaffe/scripts/Makefile.in:1.220
--- kaffe/kaffe/scripts/Makefile.in:1.219	Tue Aug  7 01:44:53 2007
+++ kaffe/kaffe/scripts/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -158,8 +158,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.170 kaffe/kaffe/scripts/bat/Makefile.in:1.171
--- kaffe/kaffe/scripts/bat/Makefile.in:1.170	Tue Aug  7 01:44:53 2007
+++ kaffe/kaffe/scripts/bat/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -133,8 +133,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.197 kaffe/kaffe/scripts/compat/Makefile.in:1.198
--- kaffe/kaffe/scripts/compat/Makefile.in:1.197	Tue Aug  7 01:44:53 2007
+++ kaffe/kaffe/scripts/compat/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -139,8 +139,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/kaffe/xprof/Makefile.in
diff -u kaffe/kaffe/xprof/Makefile.in:1.145 kaffe/kaffe/xprof/Makefile.in:1.146
--- kaffe/kaffe/xprof/Makefile.in:1.145	Tue Aug  7 01:44:53 2007
+++ kaffe/kaffe/xprof/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -172,8 +172,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/Makefile.in
diff -u kaffe/libraries/Makefile.in:1.173 kaffe/libraries/Makefile.in:1.174
--- kaffe/libraries/Makefile.in:1.173	Tue Aug  7 01:44:53 2007
+++ kaffe/libraries/Makefile.in	Sun Nov 11 21:56:43 2007
@@ -145,8 +145,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.194 kaffe/libraries/clib/Makefile.in:1.195
--- kaffe/libraries/clib/Makefile.in:1.194	Tue Aug  7 01:44:53 2007
+++ kaffe/libraries/clib/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -148,8 +148,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/awt/Makefile.in
diff -u kaffe/libraries/clib/awt/Makefile.in:1.188 kaffe/libraries/clib/awt/Makefile.in:1.189
--- kaffe/libraries/clib/awt/Makefile.in:1.188	Tue Aug  7 01:44:54 2007
+++ kaffe/libraries/clib/awt/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -155,8 +155,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/awt/X/Makefile.in
diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.183 kaffe/libraries/clib/awt/X/Makefile.in:1.184
--- kaffe/libraries/clib/awt/X/Makefile.in:1.183	Wed Sep 12 13:06:46 2007
+++ kaffe/libraries/clib/awt/X/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -171,8 +171,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/awt/nano-X/Makefile.in
diff -u kaffe/libraries/clib/awt/nano-X/Makefile.in:1.55 kaffe/libraries/clib/awt/nano-X/Makefile.in:1.56
--- kaffe/libraries/clib/awt/nano-X/Makefile.in:1.55	Wed Sep 12 13:06:46 2007
+++ kaffe/libraries/clib/awt/nano-X/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -178,8 +178,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/awt/qt/Makefile.in
diff -u kaffe/libraries/clib/awt/qt/Makefile.in:1.136 kaffe/libraries/clib/awt/qt/Makefile.in:1.137
--- kaffe/libraries/clib/awt/qt/Makefile.in:1.136	Tue Aug  7 01:44:54 2007
+++ kaffe/libraries/clib/awt/qt/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -178,8 +178,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/awt/xynth/Makefile.in
diff -u kaffe/libraries/clib/awt/xynth/Makefile.in:1.11 kaffe/libraries/clib/awt/xynth/Makefile.in:1.12
--- kaffe/libraries/clib/awt/xynth/Makefile.in:1.11	Wed Sep 12 13:06:46 2007
+++ kaffe/libraries/clib/awt/xynth/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -170,8 +170,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/management/Makefile.in
diff -u kaffe/libraries/clib/management/Makefile.in:1.192 kaffe/libraries/clib/management/Makefile.in:1.193
--- kaffe/libraries/clib/management/Makefile.in:1.192	Tue Aug  7 01:44:55 2007
+++ kaffe/libraries/clib/management/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -165,8 +165,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/math/Makefile.in
diff -u kaffe/libraries/clib/math/Makefile.in:1.186 kaffe/libraries/clib/math/Makefile.in:1.187
--- kaffe/libraries/clib/math/Makefile.in:1.186	Tue Aug  7 01:44:55 2007
+++ kaffe/libraries/clib/math/Makefile.in	Sun Nov 11 21:56:44 2007
@@ -164,8 +164,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/security/Makefile.in
diff -u kaffe/libraries/clib/security/Makefile.in:1.158 kaffe/libraries/clib/security/Makefile.in:1.159
--- kaffe/libraries/clib/security/Makefile.in:1.158	Tue Aug  7 01:44:56 2007
+++ kaffe/libraries/clib/security/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -170,8 +170,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/sound/Makefile.in
diff -u kaffe/libraries/clib/sound/Makefile.in:1.82 kaffe/libraries/clib/sound/Makefile.in:1.83
--- kaffe/libraries/clib/sound/Makefile.in:1.82	Tue Aug  7 01:44:56 2007
+++ kaffe/libraries/clib/sound/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -145,8 +145,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/sound/alsa/Makefile.in
diff -u kaffe/libraries/clib/sound/alsa/Makefile.in:1.83 kaffe/libraries/clib/sound/alsa/Makefile.in:1.84
--- kaffe/libraries/clib/sound/alsa/Makefile.in:1.83	Tue Aug  7 01:44:56 2007
+++ kaffe/libraries/clib/sound/alsa/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -186,8 +186,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/sound/common/Makefile.in
diff -u kaffe/libraries/clib/sound/common/Makefile.in:1.82 kaffe/libraries/clib/sound/common/Makefile.in:1.83
--- kaffe/libraries/clib/sound/common/Makefile.in:1.82	Tue Aug  7 01:44:56 2007
+++ kaffe/libraries/clib/sound/common/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -133,8 +133,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/sound/esd/Makefile.in
diff -u kaffe/libraries/clib/sound/esd/Makefile.in:1.83 kaffe/libraries/clib/sound/esd/Makefile.in:1.84
--- kaffe/libraries/clib/sound/esd/Makefile.in:1.83	Tue Aug  7 01:44:56 2007
+++ kaffe/libraries/clib/sound/esd/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -168,8 +168,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/clib/zip/Makefile.in
diff -u kaffe/libraries/clib/zip/Makefile.in:1.191 kaffe/libraries/clib/zip/Makefile.in:1.192
--- kaffe/libraries/clib/zip/Makefile.in:1.191	Tue Aug  7 01:44:56 2007
+++ kaffe/libraries/clib/zip/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -166,8 +166,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.582 kaffe/libraries/javalib/Makefile.in:1.583
--- kaffe/libraries/javalib/Makefile.in:1.582	Tue Oct 23 13:13:01 2007
+++ kaffe/libraries/javalib/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -148,8 +148,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/javalib/awt-implementations/Makefile.in
diff -u kaffe/libraries/javalib/awt-implementations/Makefile.in:1.67 kaffe/libraries/javalib/awt-implementations/Makefile.in:1.68
--- kaffe/libraries/javalib/awt-implementations/Makefile.in:1.67	Tue Aug  7 01:44:57 2007
+++ kaffe/libraries/javalib/awt-implementations/Makefile.in	Sun Nov 11 21:56:45 2007
@@ -148,8 +148,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.25 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.26
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.25	Sun Jun 24 23:37:27 2007
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am	Sun Nov 11 21:56:46 2007
@@ -6,7 +6,6 @@
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
-JAVAC = $(JAVA_COMPILER)
 JAVAROOT = $(LIBDIR)
 
 $(CLASSFILE): classdist_kaffeawt.stamp
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.87 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.88
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.87	Tue Aug  7 01:44:57 2007
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in	Sun Nov 11 21:56:46 2007
@@ -137,8 +137,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
@@ -292,7 +292,6 @@
 JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) java)
 CPATH = .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
-JAVAC = $(JAVA_COMPILER)
 JAVAROOT = $(LIBDIR)
 
 # Use a fake install class and dir to keep automake's JAVA (un)install tasks happy.
Index: kaffe/libraries/javalib/dnsjava/Makefile.am
diff -u kaffe/libraries/javalib/dnsjava/Makefile.am:1.4 kaffe/libraries/javalib/dnsjava/Makefile.am:1.5
--- kaffe/libraries/javalib/dnsjava/Makefile.am:1.4	Sun Jun 24 23:37:27 2007
+++ kaffe/libraries/javalib/dnsjava/Makefile.am	Sun Nov 11 21:56:46 2007
@@ -6,7 +6,6 @@
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
-JAVAC = $(JAVA_COMPILER)
 JAVAROOT = $(LIBDIR)
 
 $(CLASSFILE): classdist_dnsjava.stamp
Index: kaffe/libraries/javalib/dnsjava/Makefile.in
diff -u kaffe/libraries/javalib/dnsjava/Makefile.in:1.13 kaffe/libraries/javalib/dnsjava/Makefile.in:1.14
--- kaffe/libraries/javalib/dnsjava/Makefile.in:1.13	Tue Aug  7 01:44:57 2007
+++ kaffe/libraries/javalib/dnsjava/Makefile.in	Sun Nov 11 21:56:46 2007
@@ -137,8 +137,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
@@ -292,7 +292,6 @@
 JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) gnu)
 CPATH = .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
-JAVAC = $(JAVA_COMPILER)
 JAVAROOT = $(LIBDIR)
 
 # Use a fake install class and dir to keep automake's JAVA (un)install tasks happy.
Index: kaffe/libraries/javalib/gmp-math/Makefile.am
diff -u kaffe/libraries/javalib/gmp-math/Makefile.am:1.12 kaffe/libraries/javalib/gmp-math/Makefile.am:1.13
--- kaffe/libraries/javalib/gmp-math/Makefile.am:1.12	Mon Sep 18 17:00:54 2006
+++ kaffe/libraries/javalib/gmp-math/Makefile.am	Sun Nov 11 21:56:46 2007
@@ -6,7 +6,6 @@
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
-JAVAC = $(JAVA_COMPILER)
 JAVAROOT = $(LIBDIR)
 
 $(CLASSFILE): classdist_gmpjavamath.stamp
Index: kaffe/libraries/javalib/gmp-math/Makefile.in
diff -u kaffe/libraries/javalib/gmp-math/Makefile.in:1.76 kaffe/libraries/javalib/gmp-math/Makefile.in:1.77
--- kaffe/libraries/javalib/gmp-math/Makefile.in:1.76	Tue Aug  7 01:44:57 2007
+++ kaffe/libraries/javalib/gmp-math/Makefile.in	Sun Nov 11 21:56:46 2007
@@ -138,8 +138,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 JASMIN = @JASMIN@
+JAVAC = @JAVAC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
 JAVA_LIBS = @JAVA_LIBS@
 JIKESPROG = @JIKESPROG@
 KAFFEH = @KAFFEH@
@@ -293,7 +293,6 @@
 JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
 CPATH = .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
-JAVAC = $(JAVA_COMPILER)
 JAVAROOT = $(LIBDIR)
 
 # Use a fake install class and dir to keep automake's JAVA (un)install tasks happy.
Index: kaffe/libraries/javalib/gnu-inet/Makefile.am
diff -u kaffe/libraries/javalib/gnu-inet/Makefile.am:1.2 kaffe/libraries/javalib/gnu-inet/Makefile.am:1.3
--- kaffe/libraries/javalib/gnu-inet/Makefile.am:1.2	Sun Aug 20 22:28:41 2006
+++ kaffe/libraries/javalib/gnu-inet/Makefile.am	Sun Nov 11 21:56:47 2007
@@ -6,7 +6,6 @@
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
-JAVAC = $(JAVA_COMPILER)

*** Patch too long, truncated ***




More information about the kaffe mailing list