summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2010-01-19 23:57:49 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-20 18:50:58 +0100
commitae3175dedfd77b39ddbf76059f2b1242d1ed96bc (patch)
tree574432e9d7ed6c1912181a392b730401ad762b68
parenta903c4fefdc19bb838e808146c6aa1a32296e4cb (diff)
improve makefile dependencies for depmaker/pkgmaker runs
In a built clone, whenever I change any package/*/Makefile, depmaker and pkgmaker need to be run again. Before, depmaker wasn't run again as long as ${TOPDIR}/.config wasn't touched (which is in fact unused by depmaker and therefore probably a wrong dependency), pkgmaker wasn't run as long as .menu existed (which now has to be newer than any of the above Makefiles). While here, this patch also fixes a small whitespace error.
-rw-r--r--mk/build.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 758e3a3c4..d9d33d6c1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -10,7 +10,7 @@ endif
CONFIG_CONFIG_IN = Config.in
CONFIG = config
-DEFCONFIG= ADK_DEVELSYSTEM=n \
+DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_DEBUG=n \
ADK_STATIC=n \
ADK_MAKE_PARALLEL=n \
@@ -105,7 +105,7 @@ all: world
allcopy: all
$(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${targetdir}/
-${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config
+${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
mksh ${TOPDIR}/package/depmaker
.NOTPARALLEL:
@@ -419,7 +419,7 @@ bulk:
) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \
done <${TOPDIR}/target/bulk.lst
-.menu menu:
+menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
mksh $(TOPDIR)/package/pkgmaker
@:>.menu