mirror of
https://github.com/corda/corda.git
synced 2025-03-10 22:44:20 +00:00
Merge branch 'master' of oss.readytalk.com:/var/local/git/avian
This commit is contained in:
commit
bf84d91bad
12
makefile
12
makefile
@ -549,8 +549,10 @@ $(test-build)/%.class: $(test)/%.java
|
||||
$(test-dep): $(test-sources)
|
||||
@echo "compiling test classes"
|
||||
@mkdir -p $(test-build)
|
||||
$(javac) -d $(test-build) -bootclasspath $(classpath-build) \
|
||||
$(shell $(MAKE) -s --no-print-directory $(test-classes))
|
||||
files="$(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) \
|
||||
test/Subroutine.java
|
||||
@touch $(@)
|
||||
@ -558,8 +560,10 @@ $(test-dep): $(test-sources)
|
||||
$(test-extra-dep): $(test-extra-sources)
|
||||
@echo "compiling extra test classes"
|
||||
@mkdir -p $(test-build)
|
||||
$(javac) -d $(test-build) -bootclasspath $(classpath-build) \
|
||||
$(shell $(MAKE) -s --no-print-directory $(test-extra-classes))
|
||||
files="$(shell $(MAKE) -s --no-print-directory $(test-extra-classes))"; \
|
||||
if test -n "$${files}"; then \
|
||||
$(javac) -d $(test-build) -bootclasspath $(classpath-build) $${files}; \
|
||||
fi
|
||||
@touch $(@)
|
||||
|
||||
define compile-object
|
||||
|
Loading…
x
Reference in New Issue
Block a user