aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-04-07 15:11:17 +0000
committerMike Baker <mbm@openwrt.org>2007-04-07 15:11:17 +0000
commit169e9ea9a23425e9b48004cd49c31f6dab2e44a5 (patch)
treef1b18d2269b5430421fc70a5bdd5fd6096ec5ba4
parentdfa0901b98eb2a6e5473ddd92b1441bfbbc990c8 (diff)
downloadupstream-169e9ea9a23425e9b48004cd49c31f6dab2e44a5.tar.gz
upstream-169e9ea9a23425e9b48004cd49c31f6dab2e44a5.tar.bz2
upstream-169e9ea9a23425e9b48004cd49c31f6dab2e44a5.zip
fix a few bugs with the last few commits
SVN-Revision: 6887
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e2d5c1450f..3187f72ee7 100644
--- a/Makefile
+++ b/Makefile
@@ -47,17 +47,17 @@ endif
package/%/Makefile: ;
target/%/Makefile: ;
-tmp/.packageinfo: FORCE
-tmp/.targetinfo: FORCE
+tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) FORCE
+tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk) FORCE
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="$^" SCAN_EXTRA=""
+ 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 FORCE, $^)" SCAN_EXTRA=""
tmpinfo-clean: FORCE
-rm -rf tmp/.*info
tmp/.config-%.in: tmp/.%info
- @./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
+ ./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
.config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
if [ \! -f .config ]; then \
@@ -160,6 +160,6 @@ docclean:
symlinkclean:
find package -type l -exec rm -f {} +
-.SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.%info tmpinfo-clean tmp/.config-%.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-%
+.SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.packageinfo tmp/.targetinfo tmpinfo-clean tmp/.config-package.in tmp/.config-target.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target
FORCE: ;
.PHONY: FORCE help