projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and
[cacao.git]
/
src
/
lib
/
Makefile.am
diff --git
a/src/lib/Makefile.am
b/src/lib/Makefile.am
index f82b4aa7730fcb7c99ba141e419b9e27ed1fa0f0..b163f1f6b3849811dbf7a5a8e13619a9eaed6ad2 100644
(file)
--- a/
src/lib/Makefile.am
+++ b/
src/lib/Makefile.am
@@
-61,16
+61,20
@@
VM_CLASS_FILES = \
if ENABLE_ANNOTATIONS
VM_JAVA_FILES += \
if ENABLE_ANNOTATIONS
VM_JAVA_FILES += \
+ $(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/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 += \
$(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/ConstantPool.class \
+ classes/sun/reflect/annotation/ExceptionProxy.class \
+ classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.class \
classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.class \
classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.class \
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
endif
classes/sun/reflect/annotation/AnnotationType.class \
classes/sun/reflect/annotation/AnnotationParser.class
endif
@@
-96,12
+100,18
@@
pkgdata_DATA = nozip
endif
endif
endif
endif
+if WITH_CLASSPATH_GNU
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+else
+BOOTCLASSPATH = $(CLASSPATH_CLASSES)
+endif
+
if ENABLE_ZLIB
VM_ZIP = ../vm.zip
vm.zip: $(VM_JAVA_FILES)
$(mkdir_p) classes
if ENABLE_ZLIB
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 \
@if test "$(JAR)" = "zip" -o "$(JAR)" = "zip.exe"; then \
cd classes && $(JAR) -r -D $(VM_ZIP) .; \
else \
@@
-110,7
+120,7
@@
vm.zip: $(VM_JAVA_FILES)
else
nozip: $(VM_JAVA_FILES)
$(mkdir_p) classes
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:
endif
clean-local: