X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Ftoplevel.mk;h=9d0eb2593356c80d1cd45a455fef2cb96bda4325;hb=ecf4c24b4e8e714dd20b8327948b0f7f8b991424;hp=6fd4a534b29d08dbeddda0558762fd3a7dc224c6;hpb=83b31e078f713ebc761f90030d71e12618bd68ad;p=openwrt-10.03%2F.git

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 6fd4a534b..9d0eb2593 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -24,6 +24,9 @@ export REVISION
 export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
+# make sure that a predefined CFLAGS variable does not disturb packages
+export CFLAGS=
+
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
 endif
@@ -44,25 +47,25 @@ prepare-tmpinfo: FORCE
 	./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
 	touch $(TOPDIR)/tmp/.build
 
-.config: ./scripts/config/conf prepare-tmpinfo
-	@+if [ \! -f .config ]; then \
+.config: ./scripts/config/conf prepare-tmpinfo $(if $(CONFIG_HAVE_DOT_CONFIG),,FORCE)
+	@+if [ \! -f .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \
 		[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
-		$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
+		$(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
 	fi
 
 scripts/config/mconf:
-	@$(_SINGLE)$(SUBMAKE) -s -j1 -C scripts/config all
+	@$(_SINGLE)$(SUBMAKE) -s -C scripts/config all
 
 $(eval $(call rdep,scripts/config,scripts/config/mconf))
 
 scripts/config/conf:
-	@$(_SINGLE)$(SUBMAKE) -s -j1 -C scripts/config conf
+	@$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf
 
 config: scripts/config/conf prepare-tmpinfo FORCE
 	$< Config.in
 
 config-clean: FORCE
-	$(NO_TRACE_MAKE) -C scripts/config clean
+	$(_SINGLE)$(NO_TRACE_MAKE) -C scripts/config clean
 
 defconfig: scripts/config/conf prepare-tmpinfo FORCE
 	touch .config
@@ -78,10 +81,10 @@ menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
 	$< Config.in
 
 kernel_oldconfig: .config FORCE
-	$(NO_TRACE_MAKE) -C target/linux oldconfig
+	$(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig
 
 kernel_menuconfig: .config FORCE
-	$(NO_TRACE_MAKE) -C target/linux menuconfig
+	$(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
 
 tmp/.prereq-build: include/prereq-build.mk
 	mkdir -p tmp
@@ -103,7 +106,7 @@ clean dirclean: .config
 
 prereq:: .config
 	@+$(MAKE) -s tmp/.prereq-build $(PREP_MK)
-	@$(NO_TRACE_MAKE) -s $@
+	@+$(NO_TRACE_MAKE) -s $@
 
 %::
 	@+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq
@@ -113,14 +116,14 @@ help:
 	cat README
 
 docs docs/compile: FORCE
-	@$(_SINGLE)$(SUBMAKE) -j1 -C docs compile
+	@$(_SINGLE)$(SUBMAKE) -C docs compile
 
 docs/clean: FORCE
-	@$(_SINGLE)$(SUBMAKE) -j1 -C docs clean
+	@$(_SINGLE)$(SUBMAKE) -C docs clean
 
 distclean:
 	rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds package/openwrt-packages bin
-	@$(_SINGLE)$(SUBMAKE) -j1 -C scripts/config clean
+	@$(_SINGLE)$(SUBMAKE) -C scripts/config clean
 
 ifeq ($(findstring v,$(DEBUG)),)
   .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo