[kaffe] CVS kaffe (robilad): Small cleanup for internal test makefile
Kaffe CVS
cvs-commits at kaffe.org
Sat Jan 1 12:02:24 PST 2005
PatchSet 5742
Date: 2005/01/01 19:57:46
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Small cleanup for internal test makefile
2005-01-01 Dalibor Topic <robilad at kaffe.org>
* test/internal/Makefile.am (CPATH): New variable
as shortcut for classpath setting. Prepended '.' to
classpath.
Members:
ChangeLog:1.3286->1.3287
libraries/clib/classpath/Makefile.in:1.6->1.7
test/internal/Makefile.am:1.13->1.14
test/internal/Makefile.in:1.89->1.90
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3286 kaffe/ChangeLog:1.3287
--- kaffe/ChangeLog:1.3286 Sat Jan 1 17:10:13 2005
+++ kaffe/ChangeLog Sat Jan 1 19:57:46 2005
@@ -1,3 +1,9 @@
+2005-01-01 Dalibor Topic <robilad at kaffe.org>
+
+ * test/internal/Makefile.am (CPATH): New variable
+ as shortcut for classpath setting. Prepended '.' to
+ classpath.
+
2005-01-01 Guilhem Lavaux <guilhem at kaffe.org>
* config/sparc/jit-alpha.def: Renamed setEpilogueLabel to
Index: kaffe/libraries/clib/classpath/Makefile.in
diff -u kaffe/libraries/clib/classpath/Makefile.in:1.6 kaffe/libraries/clib/classpath/Makefile.in:1.7
--- kaffe/libraries/clib/classpath/Makefile.in:1.6 Sat Jan 1 08:45:59 2005
+++ kaffe/libraries/clib/classpath/Makefile.in Sat Jan 1 19:57:50 2005
@@ -378,6 +378,7 @@
native_state.c native_state.h
libclasspath_la_LDFLAGS = \
+ $(KLIBFLAGS) \
-release $(PACKAGE_VERSION)
all: all-am
Index: kaffe/test/internal/Makefile.am
diff -u kaffe/test/internal/Makefile.am:1.13 kaffe/test/internal/Makefile.am:1.14
--- kaffe/test/internal/Makefile.am:1.13 Fri Dec 31 16:58:40 2004
+++ kaffe/test/internal/Makefile.am Sat Jan 1 19:57:50 2005
@@ -77,50 +77,53 @@
TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `BOOTCLASSPATH="."; export BOOTCLASSPATH; . $(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
+##CPATH = $(top_builddir)/libraries/javalib/rt.jar
+CPATH = .:$(top_builddir)/libraries/javalib/rt.jar
+
ConstMethods.class: $(srcdir)/ConstMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ConstMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ConstMethods.java
ConstMathMethods.class: $(srcdir)/ConstMathMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ConstMathMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ConstMathMethods.java
ParameterizedMethods.class: $(srcdir)/ParameterizedMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMethods.java
ParameterizedMathMethods.class: $(srcdir)/ParameterizedMathMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedMathMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
ParameterizedLogicalMethods.class: $(srcdir)/ParameterizedLogicalMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedLogicalMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedLogicalMethods.java
ParameterizedBitwiseMethods.class: $(srcdir)/ParameterizedBitwiseMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedBitwiseMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedBitwiseMethods.java
ControlFlowMethods.class: $(srcdir)/ControlFlowMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ControlFlowMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ControlFlowMethods.java
StaticMethodCall.class: $(srcdir)/StaticMethodCall.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/StaticMethodCall.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/StaticMethodCall.java
TypeConversion.class: $(srcdir)/TypeConversion.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/TypeConversion.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/TypeConversion.java
StaticFields.class: $(srcdir)/StaticFields.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/StaticFields.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/StaticFields.java
PrimitiveArrays.class: $(srcdir)/PrimitiveArrays.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/PrimitiveArrays.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/PrimitiveArrays.java
ObjectFields.class: $(srcdir)/ObjectFields.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ObjectFields.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ObjectFields.java
MethodOptimizations.class: $(srcdir)/MethodOptimizations.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/MethodOptimizations.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/MethodOptimizations.java
-NativeMethodCall.class java/lang/System.class: $(srcdir)/NativeMethodCall.java $(srcdir)/System.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/System.java $(srcdir)/NativeMethodCall.java
+NativeMethodCall.class java/lang/System.class: $(srcdir)/NativeMethodCall.java $(srcdir)/java/lang/System.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/java/lang/System.java $(srcdir)/NativeMethodCall.java
Exceptions.class: $(srcdir)/Exceptions.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/Exceptions.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/Exceptions.java
jit_stub.o: java/lang/System.class $(JAVA_CLASSES)
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.89 kaffe/test/internal/Makefile.in:1.90
--- kaffe/test/internal/Makefile.in:1.89 Fri Dec 31 16:58:40 2004
+++ kaffe/test/internal/Makefile.in Sat Jan 1 19:57:50 2005
@@ -427,6 +427,7 @@
Exceptions.class
TESTS_ENVIRONMENT = env TEST_CLASSES="$(JAVA_CLASSES)" `BOOTCLASSPATH="."; export BOOTCLASSPATH; . $(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
+CPATH = .:$(top_builddir)/libraries/javalib/rt.jar
TESTS = $(check_PROGRAMS)
XFAIL_TESTS =
EXTRA_DIST = \
@@ -783,49 +784,49 @@
$(SHELL) $(REGEN_FORWARD) $(top_srcdir)/kaffe/kaffe/$@ $@
ConstMethods.class: $(srcdir)/ConstMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ConstMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ConstMethods.java
ConstMathMethods.class: $(srcdir)/ConstMathMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ConstMathMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ConstMathMethods.java
ParameterizedMethods.class: $(srcdir)/ParameterizedMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMethods.java
ParameterizedMathMethods.class: $(srcdir)/ParameterizedMathMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedMathMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedMathMethods.java
ParameterizedLogicalMethods.class: $(srcdir)/ParameterizedLogicalMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedLogicalMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedLogicalMethods.java
ParameterizedBitwiseMethods.class: $(srcdir)/ParameterizedBitwiseMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ParameterizedBitwiseMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ParameterizedBitwiseMethods.java
ControlFlowMethods.class: $(srcdir)/ControlFlowMethods.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ControlFlowMethods.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ControlFlowMethods.java
StaticMethodCall.class: $(srcdir)/StaticMethodCall.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/StaticMethodCall.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/StaticMethodCall.java
TypeConversion.class: $(srcdir)/TypeConversion.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/TypeConversion.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/TypeConversion.java
StaticFields.class: $(srcdir)/StaticFields.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/StaticFields.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/StaticFields.java
PrimitiveArrays.class: $(srcdir)/PrimitiveArrays.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/PrimitiveArrays.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/PrimitiveArrays.java
ObjectFields.class: $(srcdir)/ObjectFields.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/ObjectFields.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/ObjectFields.java
MethodOptimizations.class: $(srcdir)/MethodOptimizations.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/MethodOptimizations.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/MethodOptimizations.java
-NativeMethodCall.class java/lang/System.class: $(srcdir)/NativeMethodCall.java $(srcdir)/System.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/System.java $(srcdir)/NativeMethodCall.java
+NativeMethodCall.class java/lang/System.class: $(srcdir)/NativeMethodCall.java $(srcdir)/java/lang/System.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/java/lang/System.java $(srcdir)/NativeMethodCall.java
Exceptions.class: $(srcdir)/Exceptions.java
- $(JIKES) -g -classpath $(top_builddir)/libraries/javalib/rt.jar -d . $(srcdir)/Exceptions.java
+ $(JIKES) -g -classpath $(CPATH) -d . $(srcdir)/Exceptions.java
jit_stub.o: java/lang/System.class $(JAVA_CLASSES)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
More information about the kaffe
mailing list