[kaffe] CVS kaffe (robilad): small cleanup for internal test makefile

Kaffe CVS cvs-commits at kaffe.org
Sat Jul 8 13:00:33 PDT 2006


PatchSet 7321 
Date: 2006/07/08 19:48:47
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small cleanup for internal test makefile

2006-07-08  Dalibor Topic  <robilad at kaffe.org>

        * test/internal/Makefile.am (JAVA_SOURCE_FILES) List all the
        sources. Use a single target to build all java test classes.
        (JAVA_CLASSES) Added java/lang/ stuf classes.
        (TEST_CLASSES) List all test classes.
        (jit_stub.o) Depend on JAVA_CLASSES alone.
        (EXTRA_DIST) Use JAVA_SOURCE_FILES.
        (CLEANFILES) Use JAVA_CLASSES.

Members: 
	ChangeLog:1.4824->1.4825 
	libraries/javalib/external/classpath/config.guess:1.24->1.25 
	libraries/javalib/external/classpath/ltmain.sh:1.24->1.25 
	scripts/ltmain.sh:1.28->1.29 
	test/internal/Makefile.am:1.25->1.26 
	test/internal/Makefile.in:1.136->1.137 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4824 kaffe/ChangeLog:1.4825
--- kaffe/ChangeLog:1.4824	Sat Jul  8 15:07:26 2006
+++ kaffe/ChangeLog	Sat Jul  8 19:48:47 2006
@@ -1,3 +1,13 @@
+2006-07-08  Dalibor Topic  <robilad at kaffe.org>
+
+	* test/internal/Makefile.am (JAVA_SOURCE_FILES) List all the 
+	sources. Use a single target to build all java test classes.
+	(JAVA_CLASSES) Added java/lang/ stuf classes.
+	(TEST_CLASSES) List all test classes.
+	(jit_stub.o) Depend on JAVA_CLASSES alone.
+	(EXTRA_DIST) Use JAVA_SOURCE_FILES.
+	(CLEANFILES) Use JAVA_CLASSES.
+
 2006-07-08  Kashyap  <ck_kashyap at yahoo.com>
 
 	* libraries/clib/awt/nano-X/window.c
Index: kaffe/libraries/javalib/external/classpath/config.guess
diff -u kaffe/libraries/javalib/external/classpath/config.guess:1.24 kaffe/libraries/javalib/external/classpath/config.guess:1.25
--- kaffe/libraries/javalib/external/classpath/config.guess:1.24	Sat Jul  8 14:44:50 2006
+++ kaffe/libraries/javalib/external/classpath/config.guess	Sat Jul  8 19:48:54 2006
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-12-13'
+timestamp='2005-08-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -779,7 +779,7 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -851,7 +851,7 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,7 +870,7 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -919,9 +919,6 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -967,7 +964,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI)
+	#ifdef __INTEL_COMPILER
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -977,7 +974,7 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1188,6 +1185,7 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1265,9 +1263,6 @@
 	exit ;;
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
 esac
 
Index: kaffe/libraries/javalib/external/classpath/ltmain.sh
diff -u kaffe/libraries/javalib/external/classpath/ltmain.sh:1.24 kaffe/libraries/javalib/external/classpath/ltmain.sh:1.25
--- kaffe/libraries/javalib/external/classpath/ltmain.sh:1.24	Sat Jul  8 14:44:50 2006
+++ kaffe/libraries/javalib/external/classpath/ltmain.sh	Sat Jul  8 19:48:54 2006
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -3200,6 +3203,11 @@
 	    current=`expr $number_major + $number_minor - 1`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	  ;;
Index: kaffe/scripts/ltmain.sh
diff -u kaffe/scripts/ltmain.sh:1.28 kaffe/scripts/ltmain.sh:1.29
--- kaffe/scripts/ltmain.sh:1.28	Sat Jul  8 14:44:54 2006
+++ kaffe/scripts/ltmain.sh	Sat Jul  8 19:48:55 2006
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -3200,6 +3203,11 @@
 	    current=`expr $number_major + $number_minor - 1`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	  ;;
Index: kaffe/test/internal/Makefile.am
diff -u kaffe/test/internal/Makefile.am:1.25 kaffe/test/internal/Makefile.am:1.26
--- kaffe/test/internal/Makefile.am:1.25	Sat Jul  8 14:44:56 2006
+++ kaffe/test/internal/Makefile.am	Sat Jul  8 19:48:56 2006
@@ -73,7 +73,7 @@
 nodist_jitBasic_SOURCES = $(nodist_GEN_SRCS)
 
 # Order matters here!
-JAVA_CLASSES = \
+TEST_CLASSES = \
 	ConstMethods.class \
 	ConstMathMethods.class \
 	ParameterizedMethods.class \
@@ -91,92 +91,53 @@
 	Exceptions.class \
 	VirtualMethod.class
 
-TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `. $(top_builddir)/BUILD_ENVIRONMENT; BOOTCLASSPATH=.:\$${BOOTCLASSPATH}; export BOOTCLASSPATH; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
-
-##CPATH = $(top_builddir)/libraries/javalib/rt.jar
-CPATH = .:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
-
-ConstMethods.class: $(srcdir)/ConstMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ConstMethods.java
-
-ConstMathMethods.class: $(srcdir)/ConstMathMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ConstMathMethods.java
-
-ParameterizedMethods.class: $(srcdir)/ParameterizedMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMethods.java
-
-ParameterizedMathMethods.class: $(srcdir)/ParameterizedMathMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
-
-ParameterizedLogicalMethods.class: $(srcdir)/ParameterizedLogicalMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedLogicalMethods.java
-
-ParameterizedBitwiseMethods.class: $(srcdir)/ParameterizedBitwiseMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedBitwiseMethods.java
-
-ControlFlowMethods.class: $(srcdir)/ControlFlowMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ControlFlowMethods.java
-
-StaticMethodCall.class: $(srcdir)/StaticMethodCall.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/StaticMethodCall.java
-
-TypeConversion.class: $(srcdir)/TypeConversion.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/TypeConversion.java
-
-StaticFields.class: $(srcdir)/StaticFields.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/StaticFields.java
-
-PrimitiveArrays.class: $(srcdir)/PrimitiveArrays.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/PrimitiveArrays.java
-
-ObjectFields.class: $(srcdir)/ObjectFields.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ObjectFields.java
+JAVA_CLASSES = \
+	$(TEST_CLASSES) \
+	java/lang/System.class \
+	java/lang/VMSystem.class
 
-MethodOptimizations.class: $(srcdir)/MethodOptimizations.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/MethodOptimizations.java
+JAVA_SOURCE_FILES = \
+	$(srcdir)/ConstMethods.java \
+	$(srcdir)/ConstMathMethods.java \
+	$(srcdir)/ParameterizedMethods.java \
+	$(srcdir)/ParameterizedMathMethods.java \
+	$(srcdir)/ParameterizedLogicalMethods.java \
+	$(srcdir)/ParameterizedBitwiseMethods.java \
+	$(srcdir)/ControlFlowMethods.java \
+	$(srcdir)/StaticMethodCall.java \
+	$(srcdir)/TypeConversion.java \
+	$(srcdir)/StaticFields.java \
+	$(srcdir)/PrimitiveArrays.java \
+	$(srcdir)/ObjectFields.java \
+	$(srcdir)/MethodOptimizations.java \
+	$(srcdir)/NativeMethodCall.java \
+	$(srcdir)/Exceptions.java \
+	$(srcdir)/VirtualMethod.java \
+	$(srcdir)/java/lang/System.java \
+	$(srcdir)/java/lang/VMSystem.java
 
-NativeMethodCall.class java/lang/System.class java/lang/VMSystem.class: $(srcdir)/NativeMethodCall.java   $(srcdir)/java/lang/VMSystem.java $(srcdir)/java/lang/System.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/java/lang/VMSystem.java $(srcdir)/java/lang/System.java $(srcdir)/NativeMethodCall.java
+TESTS_ENVIRONMENT = env TEST_CLASSES="$(TEST_CLASSES)" `. $(top_builddir)/BUILD_ENVIRONMENT; BOOTCLASSPATH=.:\$${BOOTCLASSPATH}; export BOOTCLASSPATH; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
 
-Exceptions.class: $(srcdir)/Exceptions.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/Exceptions.java
+CPATH = .:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
 
-VirtualMethod.class: $(srcdir)/VirtualMethod.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/VirtualMethod.java
+$(JAVA_CLASSES): $(JAVA_SOURCE_FILES)
+	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(JAVA_SOURCE_FILES)
 
-jit_stub.o: java/lang/System.class java/lang/VMSystem.class $(JAVA_CLASSES)
+jit_stub.o: $(JAVA_CLASSES)
 
 TESTS = $(check_PROGRAMS)
 
 XFAIL_TESTS =
 
 EXTRA_DIST = \
-	ConstMethods.java \
-	ConstMathMethods.java \
-	ParameterizedMethods.java \
-	ParameterizedMathMethods.java \
-	ParameterizedLogicalMethods.java \
-	ParameterizedBitwiseMethods.java \
-	ControlFlowMethods.java \
-	StaticMethodCall.java \
-	TypeConversion.java \
-	StaticFields.java \
-	PrimitiveArrays.java \
-	ObjectFields.java \
-	MethodOptimizations.java \
-	NativeMethodCall.java \
-	Exceptions.java \
-	VirtualMethod.java \
-	java/lang/System.java \
-	java/lang/VMSystem.java
+	$(JAVA_SOURCE_FILES)
 
 CLEANFILES = \
 	*.fail \
 	*.out \
 	core \
 	*.core \
-	*.class \
-	$(nodist_GEN_SRCS) \
-	java/lang/System.class  \
-	java/lang/VMSystem.class
+	$(JAVA_CLASSES) \
+	$(nodist_GEN_SRCS) 
+
 
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.136 kaffe/test/internal/Makefile.in:1.137
--- kaffe/test/internal/Makefile.in:1.136	Sat Jul  8 14:44:56 2006
+++ kaffe/test/internal/Makefile.in	Sat Jul  8 19:48:56 2006
@@ -424,7 +424,7 @@
 nodist_jitBasic_SOURCES = $(nodist_GEN_SRCS)
 
 # Order matters here!
-JAVA_CLASSES = \
+TEST_CLASSES = \
 	ConstMethods.class \
 	ConstMathMethods.class \
 	ParameterizedMethods.class \
@@ -442,39 +442,45 @@
 	Exceptions.class \
 	VirtualMethod.class
 
-TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `. $(top_builddir)/BUILD_ENVIRONMENT; BOOTCLASSPATH=.:\$${BOOTCLASSPATH}; export BOOTCLASSPATH; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
+JAVA_CLASSES = \
+	$(TEST_CLASSES) \
+	java/lang/System.class \
+	java/lang/VMSystem.class
+
+JAVA_SOURCE_FILES = \
+	$(srcdir)/ConstMethods.java \
+	$(srcdir)/ConstMathMethods.java \
+	$(srcdir)/ParameterizedMethods.java \
+	$(srcdir)/ParameterizedMathMethods.java \
+	$(srcdir)/ParameterizedLogicalMethods.java \
+	$(srcdir)/ParameterizedBitwiseMethods.java \
+	$(srcdir)/ControlFlowMethods.java \
+	$(srcdir)/StaticMethodCall.java \
+	$(srcdir)/TypeConversion.java \
+	$(srcdir)/StaticFields.java \
+	$(srcdir)/PrimitiveArrays.java \
+	$(srcdir)/ObjectFields.java \
+	$(srcdir)/MethodOptimizations.java \
+	$(srcdir)/NativeMethodCall.java \
+	$(srcdir)/Exceptions.java \
+	$(srcdir)/VirtualMethod.java \
+	$(srcdir)/java/lang/System.java \
+	$(srcdir)/java/lang/VMSystem.java
+
+TESTS_ENVIRONMENT = env TEST_CLASSES="$(TEST_CLASSES)" `. $(top_builddir)/BUILD_ENVIRONMENT; BOOTCLASSPATH=.:\$${BOOTCLASSPATH}; export BOOTCLASSPATH; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
 CPATH = .:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS = 
 EXTRA_DIST = \
-	ConstMethods.java \
-	ConstMathMethods.java \
-	ParameterizedMethods.java \
-	ParameterizedMathMethods.java \
-	ParameterizedLogicalMethods.java \
-	ParameterizedBitwiseMethods.java \
-	ControlFlowMethods.java \
-	StaticMethodCall.java \
-	TypeConversion.java \
-	StaticFields.java \
-	PrimitiveArrays.java \
-	ObjectFields.java \
-	MethodOptimizations.java \
-	NativeMethodCall.java \
-	Exceptions.java \
-	VirtualMethod.java \
-	java/lang/System.java \
-	java/lang/VMSystem.java
+	$(JAVA_SOURCE_FILES)
 
 CLEANFILES = \
 	*.fail \
 	*.out \
 	core \
 	*.core \
-	*.class \
-	$(nodist_GEN_SRCS) \
-	java/lang/System.class  \
-	java/lang/VMSystem.class
+	$(JAVA_CLASSES) \
+	$(nodist_GEN_SRCS) 
 
 all: all-am
 
@@ -684,7 +690,7 @@
 	else :; fi
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/java/lang
+	$(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/java/lang
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -813,55 +819,10 @@
 $(nodist_GEN_SRCS):
 	$(SHELL) $(REGEN_FORWARD) $(top_srcdir)/kaffe/kaffe/$@ $@
 
-ConstMethods.class: $(srcdir)/ConstMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ConstMethods.java
-
-ConstMathMethods.class: $(srcdir)/ConstMathMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ConstMathMethods.java
-
-ParameterizedMethods.class: $(srcdir)/ParameterizedMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMethods.java
-
-ParameterizedMathMethods.class: $(srcdir)/ParameterizedMathMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
-
-ParameterizedLogicalMethods.class: $(srcdir)/ParameterizedLogicalMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedLogicalMethods.java
-
-ParameterizedBitwiseMethods.class: $(srcdir)/ParameterizedBitwiseMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedBitwiseMethods.java
-
-ControlFlowMethods.class: $(srcdir)/ControlFlowMethods.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ControlFlowMethods.java
-
-StaticMethodCall.class: $(srcdir)/StaticMethodCall.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/StaticMethodCall.java
-
-TypeConversion.class: $(srcdir)/TypeConversion.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/TypeConversion.java
-
-StaticFields.class: $(srcdir)/StaticFields.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/StaticFields.java
-
-PrimitiveArrays.class: $(srcdir)/PrimitiveArrays.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/PrimitiveArrays.java
-
-ObjectFields.class: $(srcdir)/ObjectFields.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/ObjectFields.java
-
-MethodOptimizations.class: $(srcdir)/MethodOptimizations.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/MethodOptimizations.java
-
-NativeMethodCall.class java/lang/System.class java/lang/VMSystem.class: $(srcdir)/NativeMethodCall.java   $(srcdir)/java/lang/VMSystem.java $(srcdir)/java/lang/System.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/java/lang/VMSystem.java $(srcdir)/java/lang/System.java $(srcdir)/NativeMethodCall.java
-
-Exceptions.class: $(srcdir)/Exceptions.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/Exceptions.java
-
-VirtualMethod.class: $(srcdir)/VirtualMethod.java
-	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(srcdir)/VirtualMethod.java
+$(JAVA_CLASSES): $(JAVA_SOURCE_FILES)
+	$(JAVA_COMPILER) -g -classpath $(CPATH) -d . $(JAVA_SOURCE_FILES)
 
-jit_stub.o: java/lang/System.class java/lang/VMSystem.class $(JAVA_CLASSES)
+jit_stub.o: $(JAVA_CLASSES)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:




More information about the kaffe mailing list