aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-05-23 21:11:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-05-23 21:11:48 +0000
commit2555097cc691246108bc11115763d3b1c2cc4897 (patch)
treee8eb906cf8509ba250f47ec77027ae5108df1299
parent0f9285a745233f8a6b6cfc902344eca55d7b3e1e (diff)
downloadupstream-2555097cc691246108bc11115763d3b1c2cc4897.tar.gz
upstream-2555097cc691246108bc11115763d3b1c2cc4897.tar.bz2
upstream-2555097cc691246108bc11115763d3b1c2cc4897.zip
fix target rescan (version kernel changes)
SVN-Revision: 7317
-rw-r--r--Makefile7
-rw-r--r--include/scan.mk4
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index f06b151eb2..e2430164fe 100644
--- a/Makefile
+++ b/Makefile
@@ -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 1597112d03..976eb38427 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; \