diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-23 21:11:48 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-23 21:11:48 +0000 |
| commit | 5da92a31009eff4b765b5a5bfd5b85e61525e884 (patch) | |
| tree | 75fbf2beb734758a1f99b4b98b5c51ea970cf822 | |
| parent | 6b640fef19c80022ecf46c9567d489a009b35158 (diff) | |
fix target rescan (version kernel changes)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7317 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | include/scan.mk | 4 |
2 files changed, 5 insertions, 6 deletions
@@ -44,11 +44,10 @@ endif package/%/Makefile: ; target/%/Makefile: ; -tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) FORCE -tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk) FORCE -tmp/.%info: +tmp/.packageinfo tmp/.targetinfo: FORCE mkdir -p tmp/info - $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$(filter-out FORCE, $^)" SCAN_EXTRA="" + $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="" SCAN_TARGET_DEPS="$(wildcard target/*/Makefile include/kernel*.mk)" SCAN_EXTRA="" + $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(wildcard package/*/Makefile include/package*.mk include/kernel.mk)" SCAN_EXTRA="" tmpinfo-clean: FORCE -rm -rf tmp/.*info diff --git a/include/scan.mk b/include/scan.mk index 1597112d0..976eb3842 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -38,8 +38,8 @@ endif define scanfiles $(foreach FILE,$(SCAN), - tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) $(SCAN_DEPS) - tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP) + tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) $(SCAN_TARGET_DEPS) $(SCAN_DEPS) + tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP) $(SCAN_TARGET_DEPS) grep -E 'include (\$$$$\(INCLUDE_DIR\)|\$$$$\(TOPDIR\)/include)/' $(SCAN_DIR)/$(FILE)/Makefile >/dev/null && { \ $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(FILE)) \ echo Source-Makefile: $(SCAN_DIR)/$(FILE)/Makefile; \ |