X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=10652c07a33d56f76c0681df9223df9dcfc56a81;hb=d3abc2c9f5dc2d238c17bd8764f780b38cf58491;hp=96dd2e0e0d37bdb30e4b50cbf29349d2c1a85272;hpb=99fd8c9a1d16d58a678463f2bccc6f15668f042a;p=openwrt.git

diff --git a/Makefile b/Makefile
index 96dd2e0e0d..10652c07a3 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ RELEASE:=Kamikaze
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
+include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
@@ -38,14 +39,14 @@ endif
 endif
 export OPENWRTVERSION
 
-all:
+all: world
 
 .pkginfo: FORCE
 ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
 	@echo Collecting package info...
 	@-for dir in package/*/; do \
 		echo Source-Makefile: $${dir}Makefile; \
-		$(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
+		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
 	done > $@
 endif
 
@@ -55,29 +56,61 @@ 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
 
-menuconfig: scripts/config/mconf
+config: ./scripts/config/conf FORCE
 	$< Config.in
 
-config: scripts/config/conf
+defconfig: ./scripts/config/conf FORCE
+	touch .config
+	$< -D .config Config.in
+
+oldconfig: ./scripts/config/conf FORCE
+	$< -o Config.in
+
+menuconfig: ./scripts/config/mconf FORCE
 	$< Config.in
 
-config-clean:
+config-clean: FORCE
 	$(MAKE) -C scripts/config clean
 
-package/%:
-	$(MAKE) -C toolchain $(patsubst package/%,%,$@)
+package/%: .pkginfo FORCE
+	$(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%:
-	$(MAKE) -C toolchain $(patsubst target/%,%,$@)
+target/%: .pkginfo FORCE
+	$(MAKE) -C target $(patsubst target/%,%,$@)
 
-toolchain/%:
+toolchain/%: FORCE
 	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
+.config: ./scripts/config/conf FORCE
+	@[ -f .config ] || $(MAKE) menuconfig
+	$< -D .config Config.in >/dev/null 2>/dev/null
+
+download: .config FORCE
+	$(MAKE) toolchain/download
+	$(MAKE) package/download
+	$(MAKE) target/download
+
+world: .config FORCE
+	$(MAKE) toolchain/install
+	$(MAKE) target/compile
+	$(MAKE) package/compile
+	$(MAKE) package/install
+	$(MAKE) target/install
+
+clean: FORCE
+	rm -rf build_* bin
+
+dirclean: clean
+	rm -rf staging_dir_* toolchain_build_*
+
+distclean: dirclean config-clean
+	rm -rf dl .*config* .pkg*
+
 .PHONY: FORCE
 FORCE: