mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 17:15:00 +02:00
fix target rescan (version kernel changes)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7317 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6b640fef19
commit
5da92a3100
7
Makefile
7
Makefile
@ -44,11 +44,10 @@ endif
|
|||||||
package/%/Makefile: ;
|
package/%/Makefile: ;
|
||||||
target/%/Makefile: ;
|
target/%/Makefile: ;
|
||||||
|
|
||||||
tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) FORCE
|
tmp/.packageinfo tmp/.targetinfo: FORCE
|
||||||
tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk) FORCE
|
|
||||||
tmp/.%info:
|
|
||||||
mkdir -p tmp/info
|
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
|
tmpinfo-clean: FORCE
|
||||||
-rm -rf tmp/.*info
|
-rm -rf tmp/.*info
|
||||||
|
@ -38,8 +38,8 @@ endif
|
|||||||
|
|
||||||
define scanfiles
|
define scanfiles
|
||||||
$(foreach FILE,$(SCAN),
|
$(foreach FILE,$(SCAN),
|
||||||
tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) $(SCAN_DEPS)
|
tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) $(SCAN_TARGET_DEPS) $(SCAN_DEPS)
|
||||||
tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP)
|
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 && { \
|
grep -E 'include (\$$$$\(INCLUDE_DIR\)|\$$$$\(TOPDIR\)/include)/' $(SCAN_DIR)/$(FILE)/Makefile >/dev/null && { \
|
||||||
$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(FILE)) \
|
$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(FILE)) \
|
||||||
echo Source-Makefile: $(SCAN_DIR)/$(FILE)/Makefile; \
|
echo Source-Makefile: $(SCAN_DIR)/$(FILE)/Makefile; \
|
||||||
|
Loading…
Reference in New Issue
Block a user