diff options
| -rw-r--r-- | jars.mk | 9 | ||||
| -rw-r--r-- | lib.mk | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/jars.mk b/jars.mk index 99470f37435b..186a81df1a94 100644 --- a/jars.mk +++ b/jars.mk @@ -1,4 +1,5 @@ define build-jar + $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) @@ -7,10 +8,14 @@ define build-jar $(1)_TMPDIR := $$(_d)/.$$($(1)_NAME).jar.tmp - $$($(1)_PATH): $$($(1)_SOURCES) + _jars := $$(foreach jar, $$($(1)_JARS), $$($$(jar)_PATH)) + + $$($(1)_PATH): $$($(1)_SOURCES) $$(_jars) @rm -rf $$($(1)_TMPDIR) @mkdir -p $$($(1)_TMPDIR) - $$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) $$($(1)_SOURCES) + $$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) \ + $$(foreach fn, $$($(1)_SOURCES), '$$(fn)') \ + -cp "$$(subst $$(space),,$$(foreach jar,$$($(1)_JARS),$$($$(jar)_PATH):))$$$$CLASSPATH" $$(trace-jar) jar cf $$($(1)_PATH) -C $$($(1)_TMPDIR) . @rm -rf $$($(1)_TMPDIR) diff --git a/lib.mk b/lib.mk index aa92d8d94304..16a43f45e26e 100644 --- a/lib.mk +++ b/lib.mk @@ -14,6 +14,11 @@ dist-files := OS = $(shell uname -s) +# Hack to define a literal space. +space := +space += + + # Default installation paths. prefix ?= /usr/local libdir ?= $(prefix)/lib |