* src/lib/vm/reference/java/lang/VMThread.java: Updated and removed

[cacao.git] / src / lib / Makefile.am

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 63d5688682cff75970e29b2ecc39c0e74134dde8..73f8a7879f349a53c02d48939bc8d3363d506c58 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4690 2006-03-27 11:37:46Z twisti $
+## $Id: Makefile.am 5013 2006-06-06 11:22:56Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -53,8 +53,6 @@ VM_CLASS_FILES = \
        classes/java/lang/VMThrowable.class \
        classes/java/security/VMAccessController.class
 
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
-
 if ENABLE_ZLIB
 pkgdata_DATA = vm.zip
 
@@ -62,7 +60,11 @@ VM_ZIP = ../vm.zip
 
 vm.zip: $(VM_JAVA_FILES)
        $(mkdir_p) classes
-       $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes $(VM_JAVA_FILES)
+       @if test "$(JAVAC)" = "ecj"; then \
+           $(JAVAC) -bootclasspath $(CLASSPATH_GLIBJ_ZIP) -d classes -1.5 $(VM_JAVA_FILES); \
+       else \
+           $(JAVAC) -bootclasspath $(CLASSPATH_GLIBJ_ZIP) -d classes $(VM_JAVA_FILES); \
+       fi
        @if test "$(JAR)" = "zip"; then \
            cd classes && $(JAR) -r -D $(VM_ZIP) .; \
        else \
@@ -73,7 +75,11 @@ pkgdata_DATA = nozip
 
 nozip: $(VM_JAVA_FILES)
        $(mkdir_p) classes
-       $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes $(VM_JAVA_FILES)
+       @if test "$(JAVAC)" = "ecj"; then \
+           $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes -1.5 $(VM_JAVA_FILES); \
+       else \
+           $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes $(VM_JAVA_FILES); \
+       fi
 endif
 
 clean-local: