From: Mike Baker <mbm@openwrt.org>
Date: Sat, 7 Apr 2007 15:11:17 +0000 (+0000)
Subject: fix a few bugs with the last few commits
X-Git-Tag: reboot~29484
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=169e9ea9a23425e9b48004cd49c31f6dab2e44a5;p=openwrt%2Fstaging%2Fxback.git

fix a few bugs with the last few commits

SVN-Revision: 6887
---

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