diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-03 19:46:25 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-03 21:41:08 -0400 |
| commit | 663c2228be4cf1335cfa2ff358d41d8a61e57f21 (patch) | |
| tree | ffd1e82643b3c9db3902272625cd9b7dbde1ccf6 /Makefile | |
| parent | 46cc24b1b6a0472ddab62179ed268f6d13deae19 (diff) | |
Clean up some variable names, generalize the extra makefile logic
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -117,15 +117,13 @@ deps2classpath = $(shell echo $(abspath $(call deps2jars,$1)) | tr ' ' :) $(addprefix build/packages/,$(package_specific)): \ build/packages/%: RECURSIVE build/workdir/% rules/%/Makefile - CLASSPATH='$(call deps2classpath,$^)' \ - $(if $(wildcard rules/$*/subdir-deps.mk),subdir_deps='$(abspath rules/$*/subdir-deps.mk)') \ + CLASSPATH='$(call deps2classpath,$^)' extra_makefiles='$(abspath $(wildcard rules/$*/*.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 - CLASSPATH='$(call deps2classpath,$^)' \ - $(if $(wildcard rules/$*/subdir-deps.mk),subdir_deps='$(abspath rules/$*/subdir-deps.mk)') \ + CLASSPATH='$(call deps2classpath,$^)' extra_makefiles='$(abspath $(wildcard rules/$*/*.mk))' \ $(MAKE) -C build/workdir/$* -f '$(top)/rules/generic/Makefile' install DESTDIR='$(top)/$@' mkdir -p build/packages/all && lndir -silent '$(top)/$@' build/packages/all |