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 bdc41c2dcc3a915cb6e8c6a83ca3efdce8b938dc..b163f1f6b3849811dbf7a5a8e13619a9eaed6ad2 100644
(file)
--- a/
src/lib/Makefile.am
+++ b/
src/lib/Makefile.am
@@
-100,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 \
@@
-114,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: