X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=0297dfaf5e262ccfbe293d3fcd12c76075b94a03;hp=c14883a7e45373c35ee82c6f485549d52d603916;hb=1077448747f54615b93aedb9fc0f0529f8d6b2e0;hpb=f04e0aa7f8adeb16f60ab2321896ce2a16bc49d1

diff --git a/Makefile b/Makefile
index c14883a7e..0297dfaf5 100644
--- a/Makefile
+++ b/Makefile
@@ -47,11 +47,11 @@ 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=""
+	$(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=""
 
 tmpinfo-clean: FORCE
 	-rm -rf tmp/.*info
@@ -59,11 +59,9 @@ tmpinfo-clean: FORCE
 tmp/.config-%.in: tmp/.%info
 	./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
 
-
-
 .config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
-	if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \ 
-		cp $(HOME)/.openwrt/defconfig .config; \
+	if [ \! -f .config ]; then \
+		[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
 		$(NO_TRACE_MAKE) menuconfig; \
 	fi
 	$< -D .config Config.in &> /dev/null
@@ -162,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