summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-02 16:27:15 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-02 16:27:15 +0000
commitfb8ef754679006686ea99003ceee3622f473bf5f (patch)
treec9a626e295b29e2458b39d723f2b4aa6e71c1f39
parentd3b73f5c07d60bc9cd0f61e43c4be30ea98f65cb (diff)
run defconfig at the start of a normal make run to get additional config options
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3897 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile19
1 files changed, 11 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 84508b1ffc..1d45582aff 100644
--- a/Makefile
+++ b/Makefile
@@ -55,22 +55,23 @@ endif
pkginfo-clean: FORCE
-rm -f .pkginfo .config.in
-scripts/config/mconf: .config.in
+./scripts/config/mconf: .config.in
$(MAKE) -C scripts/config all
-scripts/config/conf: .config.in
+./scripts/config/conf: .config.in
$(MAKE) -C scripts/config conf
-config: scripts/config/conf FORCE
+config: ./scripts/config/conf FORCE
$< Config.in
-defdconfig: scripts/config/conf FORCE
- $< -d Config.in
+defconfig: ./scripts/config/conf FORCE
+ touch .config
+ $< -D .config Config.in
-oldconfig: scripts/config/conf FORCE
+oldconfig: ./scripts/config/conf FORCE
$< -o Config.in
-menuconfig: scripts/config/mconf FORCE
+menuconfig: ./scripts/config/mconf FORCE
$< Config.in
config-clean: FORCE
@@ -85,7 +86,9 @@ target/%: .pkginfo FORCE
toolchain/%: FORCE
$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
-world: FORCE
+world: ./scripts/config/conf FORCE
+ touch .config
+ $< -D .config Config.in >/dev/null 2>/dev/null
$(MAKE) toolchain/install
$(MAKE) target/compile
$(MAKE) package/compile