diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-31 00:49:10 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-31 00:49:10 -0400 |
| commit | 91f429648527f96c47dccde49ab5c05642debab5 (patch) | |
| tree | 99dc1f15165a4018558138229fdee38024ce0975 /Makefile | |
| parent | 719c44cf710cefaf55c69f64d131f4f90cf6727b (diff) | |
get subdir-deps working
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -116,17 +116,16 @@ deps2classpath = $(shell echo $(abspath $(call deps2jars,$1)) | tr ' ' :) $(addprefix build/packages/,$(package_specific)): \ build/packages/%: RECURSIVE build/workdir/% rules/%/Makefile - $(MAKE) -C build/workdir/$* -f '$(top)/rules/$*/Makefile' install \ - DESTDIR='$(top)/$@' \ - CLASSPATH='$(call deps2classpath,$^)' + CLASSPATH='$(call deps2classpath,$^)' \ + $(if $(wildcard rules/$*/subdir-deps.mk),subdir_deps='$(abspath rules/$*/subdir-deps.mk)') \ + $(MAKE) -C build/workdir/$* -f '$(top)/rules/$*/Makefile' install DESTDIR='$(top)/$@' mkdir -p build/packages/all && lndir -silent '$(top)/$@' build/packages/all - $(addprefix build/packages/,$(package_generic)): \ build/packages/%: RECURSIVE build/workdir/% rules/generic/Makefile - $(MAKE) -C build/workdir/$* -f '$(top)/rules/generic/Makefile' install \ - DESTDIR='$(top)/$@' \ - CLASSPATH='$(call deps2classpath,$^)' + CLASSPATH='$(call deps2classpath,$^)' \ + $(if $(wildcard rules/$*/subdir-deps.mk),subdir_deps='$(abspath rules/$*/subdir-deps.mk)') \ + $(MAKE) -C build/workdir/$* -f '$(top)/rules/generic/Makefile' install DESTDIR='$(top)/$@' mkdir -p build/packages/all && lndir -silent '$(top)/$@' build/packages/all # boilerplate ################################################################## |