Merge branch 'master' of oss.readytalk.com:/var/local/git/avian

This commit is contained in:
jet 2009-09-17 14:07:16 -06:00
commit bf84d91bad

View File

@ -549,8 +549,10 @@ $(test-build)/%.class: $(test)/%.java
$(test-dep): $(test-sources) $(test-dep): $(test-sources)
@echo "compiling test classes" @echo "compiling test classes"
@mkdir -p $(test-build) @mkdir -p $(test-build)
$(javac) -d $(test-build) -bootclasspath $(classpath-build) \ files="$(shell $(MAKE) -s --no-print-directory $(test-classes))"; \
$(shell $(MAKE) -s --no-print-directory $(test-classes)) if test -n "$${files}"; then \
$(javac) -d $(test-build) -bootclasspath $(classpath-build) $${files}; \
fi
$(javac) -source 1.2 -target 1.1 -XDjsrlimit=0 -d $(test-build) \ $(javac) -source 1.2 -target 1.1 -XDjsrlimit=0 -d $(test-build) \
test/Subroutine.java test/Subroutine.java
@touch $(@) @touch $(@)
@ -558,8 +560,10 @@ $(test-dep): $(test-sources)
$(test-extra-dep): $(test-extra-sources) $(test-extra-dep): $(test-extra-sources)
@echo "compiling extra test classes" @echo "compiling extra test classes"
@mkdir -p $(test-build) @mkdir -p $(test-build)
$(javac) -d $(test-build) -bootclasspath $(classpath-build) \ files="$(shell $(MAKE) -s --no-print-directory $(test-extra-classes))"; \
$(shell $(MAKE) -s --no-print-directory $(test-extra-classes)) if test -n "$${files}"; then \
$(javac) -d $(test-build) -bootclasspath $(classpath-build) $${files}; \
fi
@touch $(@) @touch $(@)
define compile-object define compile-object