* src/vm/jit/i386/darwin/md-os.c (md_replace_executionstate_read):

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

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f82b4aa7730fcb7c99ba141e419b9e27ed1fa0f0..387244b5d52b661e5ccf95e930178ebe668f34ef 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,9 +1,7 @@
 ## src/lib/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
+## Copyright (C) 1996-2005, 2006, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -24,12 +22,13 @@
 
 
 EXTRA_DIST = \
-       $(VM_JAVA_FILES)
+       $(VM_JAVA_FILES_GNU) \
+       $(VM_JAVA_FILES_GNU_ANNOTATIONS) \
+       $(VM_JAVA_FILES_CLDC1_1)
 
 CLEANFILES = vm.zip
 
-if WITH_CLASSPATH_GNU
-VM_JAVA_FILES = \
+VM_JAVA_FILES_GNU = \
        $(top_srcdir)/src/lib/gnu/gnu/classpath/VMStackWalker.java \
        $(top_srcdir)/src/lib/gnu/gnu/classpath/VMSystemProperties.java \
        $(top_srcdir)/src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java \
@@ -44,35 +43,27 @@ VM_JAVA_FILES = \
        $(top_srcdir)/src/lib/gnu/java/security/VMAccessController.java \
        $(top_srcdir)/src/lib/gnu/sun/misc/Unsafe.java
 
-VM_CLASS_FILES = \
-       classes/gnu/classpath/VMStackWalker.class \
-       classes/gnu/classpath/VMSystemProperties.class \
-       classes/gnu/java/lang/management/VMMemoryMXBeanImpl.class \
-       classes/gnu/java/lang/management/VMRuntimeMXBeanImpl.class \
-       classes/java/lang/VMClassLoader.class \
-       classes/java/lang/VMString.class \
-       classes/java/lang/VMThread.class \
-       classes/java/lang/VMThrowable.class \
-       classes/java/lang/reflect/Constructor.class \
-       classes/java/lang/reflect/Field.class \
-       classes/java/lang/reflect/Method.class \
-       classes/java/security/VMAccessController.class \
-       classes/sun/misc/Unsafe.class
-
-if ENABLE_ANNOTATIONS
-VM_JAVA_FILES += \
+VM_JAVA_FILES_GNU_ANNOTATIONS = \
+       $(top_srcdir)/src/lib/gnu/sun/reflect/ConstantPool.java \
+       $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java \
+       $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java \
        $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java \
        $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java \
-       $(top_srcdir)/src/lib/gnu/sun/reflect/ConstantPool.java \
        $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/AnnotationType.java \
        $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/AnnotationParser.java
 
-VM_CLASS_FILES += \
-       classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.class \
-       classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.class \
-       classes/sun/reflect/ConstantPool.class \
-       classes/sun/reflect/annotation/AnnotationType.class \
-       classes/sun/reflect/annotation/AnnotationParser.class
+VM_JAVA_FILES_CLDC1_1 = \
+       $(top_srcdir)/src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java
+
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+
+if WITH_CLASSPATH_GNU
+VM_JAVA_FILES = \
+       $(VM_JAVA_FILES_GNU)
+
+if ENABLE_ANNOTATIONS
+VM_JAVA_FILES += \
+       $(VM_JAVA_FILES_GNU_ANNOTATIONS)
 endif
 
 if ENABLE_ZLIB
@@ -84,10 +75,7 @@ endif
 
 if WITH_CLASSPATH_CLDC1_1
 VM_JAVA_FILES = \
-       $(top_srcdir)/src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java
-
-VM_CLASS_FILES = \
-       classes/com/sun/cldchi/jvm/FileDescriptor.class
+       $(VM_JAVA_FILES_CLDC1_1)
 
 if ENABLE_ZLIB
 pkgdata_DATA = vm.zip
@@ -101,7 +89,7 @@ VM_ZIP = ../vm.zip
 
 vm.zip: $(VM_JAVA_FILES)
        $(mkdir_p) classes
-       $(JAVAC) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES)
+       $(JAVAC) -bootclasspath $(BOOTCLASSPATH) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES)
        @if test "$(JAR)" = "zip" -o "$(JAR)" = "zip.exe"; then \
            cd classes && $(JAR) -r -D $(VM_ZIP) .; \
        else \
@@ -110,7 +98,7 @@ vm.zip: $(VM_JAVA_FILES)
 else
 nozip: $(VM_JAVA_FILES)
        $(mkdir_p) classes
-       $(JAVAC) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES)
+       $(JAVAC) -bootclasspath $(BOOTCLASSPATH) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES)
 endif
 
 clean-local: