diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-08-30 22:43:25 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-08-30 22:43:25 +0000 |
| commit | 5b1e27168466fd4c63711b2021b2f39320e6894d (patch) | |
| tree | dc3ea2057f8d7654bb4b789aaaeba53cb9463f71 | |
| parent | 47c286261b0e1bb4b6efc72c237a370aaf36cbd7 (diff) | |
fix a dependency bug
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8561 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/subdir.mk | 2 | ||||
| -rw-r--r-- | package/Makefile | 15 | ||||
| -rw-r--r-- | target/Makefile | 8 |
3 files changed, 9 insertions, 16 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index 0a3eff307..40a06ed9e 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -38,7 +38,7 @@ endef define stampfile $(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3) $$($(1)/stamp-$(3)): $(TMP_DIR)/.build - @+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) || \ + @+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) $(4) || \ $(MAKE) $$($(1)/flags-$(3)) $(1)/$(3) @mkdir -p $$$$(dirname $$($(1)/stamp-$(3))) @touch $$($(1)/stamp-$(3)) diff --git a/package/Makefile b/package/Makefile index 38b650c09..38e39da29 100644 --- a/package/Makefile +++ b/package/Makefile @@ -40,15 +40,10 @@ $(curdir)/index: FORCE $(curdir)/flags-install:= -j1 -$(eval $(call stampfile,$(curdir),package,prereq)) -$(eval $(call stampfile,$(curdir),package,cleanup)) -$(eval $(call stampfile,$(curdir),package,compile)) -$(eval $(call stampfile,$(curdir),package,install)) -$(eval $(call stampfile,$(curdir),package,rootfs-prepare)) - -$($(curdir)/stamp-cleanup): $(TMP_DIR)/.build -$($(curdir)/stamp-compile): $($(curdir)/stamp-cleanup) $(TMP_DIR)/.build -$($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(TMP_DIR)/.build -$($(curdir)/stamp-rootfs-prepare): $($(curdir)/stamp-install) $(TMP_DIR)/.build +$(eval $(call stampfile,$(curdir),package,prereq,.config)) +$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,rootfs-prepare,$(TMP_DIR)/.build)) $(eval $(call subdir,$(curdir))) diff --git a/target/Makefile b/target/Makefile index b98cd96bf..3d36d2671 100644 --- a/target/Makefile +++ b/target/Makefile @@ -12,12 +12,10 @@ $(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),ima $(curdir)/imagebuilder/prepare:=$(curdir)/linux/install -$(eval $(call stampfile,$(curdir),target,prereq)) -$(eval $(call stampfile,$(curdir),target,compile)) -$(eval $(call stampfile,$(curdir),target,install)) +$(eval $(call stampfile,$(curdir),target,prereq,.config)) +$(eval $(call stampfile,$(curdir),target,compile,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),target,install,$(TMP_DIR)/.build)) -$($(curdir)/stamp-prereq): .config -$($(curdir)/stamp-compile): $(TMP_DIR)/.build $($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(eval $(call subdir,$(curdir))) |