X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/29235f2acfbb809cae67766f0ca905107e62ab1f..d80cb30469c1822c8abc8c4693188dd14180771a:/Makefile

diff --git a/Makefile b/Makefile
index 718053e00..dbfdb8e82 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,6 @@ SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
 export TOPDIR=${CURDIR}
-ifeq ($(KBUILD_VERBOSE),99)
-  MAKE:=3>/dev/null $(MAKE)
-endif
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
 include $(TOPDIR)/include/verbose.mk
@@ -41,121 +38,87 @@ export OPENWRTVERSION
 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-  world: tmp/.prereq-packages tmp/.prereq-target
-endif
-
-define stamp
-tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
-endef
-
-STAMP_pkginfo=$(call stamp,pkginfo,package)
-STAMP_targetinfo=$(call stamp,targetinfo,target/linux)
-define scan_info
-
-$(STAMP_$(1)):
-	@mkdir -p tmp/info
-	@rm -f tmp/info/.stamp-$(1)*
-	@touch $$@
-
-$(foreach FILE,$(shell ls $(2)/*/Makefile $(5)),
-tmp/.$(1): $(FILE)
-$(FILE):
-)
-
-ifneq ($(5),)
-tmp/.$(1): $(shell ls $(5))
+  world: tmp/.prereq-package tmp/.prereq-target
 endif
 
-tmp/.$(1): $(STAMP_$(1)) $(4)
-	@echo -n Collecting $(3) info... 
-	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$(1)" SCAN_DIR="$(2)" SCAN_NAME="$(3)" SCAN_DEPS="$(4)" SCAN_EXTRA="$(5)"
-
-endef
+package/%/Makefile: ;
+target/%/Makefile: ;
 
-$(eval $(call scan_info,pkginfo,package,package,include/package.mk))
-$(eval $(call scan_info,targetinfo,target/linux,target,include/kernel-build.mk include/kernel-version.mk,target/linux/*/profiles/*.mk))
+tmp/.packageinfo tmp/.targetinfo: FORCE
+	mkdir -p tmp/info
+	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="" SCAN_TARGET_DEPS="$(wildcard target/*/Makefile include/kernel*.mk)" SCAN_EXTRA=""
+	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(wildcard package/*/Makefile include/package*.mk include/kernel.mk)" SCAN_EXTRA=""
 
 tmpinfo-clean: FORCE
-	@-rm -rf tmp/.pkginfo tmp/.targetinfo
+	-rm -rf tmp/.*info
 
-tmp/.config.in: tmp/.pkginfo
-	@./scripts/metadata.pl package_config < $< > $@ || rm -f $@
+tmp/.config-%.in: tmp/.%info scripts/metadata.pl
+	./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
 
-tmp/.config-target.in: tmp/.targetinfo
-	@./scripts/metadata.pl target_config < $< > $@ || rm -f $@
-
-.config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
-	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-	@$< -D .config Config.in &> /dev/null
+.config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
+	if [ \! -f .config ]; then \
+		[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
+		$(NO_TRACE_MAKE) menuconfig; \
+	fi
+	$< -D .config Config.in &> /dev/null
 
 scripts/config/mconf:
-	@$(MAKE) -C scripts/config all
+	$(MAKE) -C scripts/config all
 
 scripts/config/conf:
-	@$(MAKE) -C scripts/config conf
+	$(MAKE) -C scripts/config conf
+
 
-config: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+
+config: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
 	$< Config.in
 
 config-clean: FORCE
 	$(NO_TRACE_MAKE) -C scripts/config clean
 
-defconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+defconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
 	touch .config
 	$< -D .config Config.in
 
-oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
 	$< -o Config.in
 
-menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
+menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE
+	if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+		cp $(HOME)/.openwrt/defconfig .config; \
+	fi
 	$< Config.in
 
 kernel_menuconfig: .config FORCE
 	-$(MAKE) target/linux-prepare
 	$(NO_TRACE_MAKE) -C target/linux menuconfig
 
-package/%: 
-	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
-	$(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%:
-	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
-	$(MAKE) -C target $(patsubst target/%,%,$@)
 
-tools/%: FORCE
-	$(MAKE) -C tools $(patsubst tools/%,%,$@)
+package/% target/%: tmp/.packageinfo
+toolchain/% package/% target/%: tmp/.targetinfo
+package/% target/% tools/% toolchain/%: FORCE
+	$(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-toolchain/%: tmp/.targetinfo FORCE
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 tmp/.prereq-build: include/prereq-build.mk
-	@mkdir -p tmp
-	@rm -f tmp/.host.mk
-	@$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
-		echo "Prerequisite check failed. Use FORCE=1 to override."; \
-		false; \
-	}
-	@touch $@
-
-tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config
-	@mkdir -p tmp
-	@rm -f tmp/.host.mk
-	@$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+	mkdir -p tmp
+	rm -f tmp/.host.mk
+	$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
-	@touch $@
+	touch $@
 
-tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config
-	@mkdir -p tmp
-	@rm -f tmp/.host.mk
-	@$(NO_TRACE_MAKE) -s -C target prereq 2>/dev/null || { \
+tmp/.prereq-%: include/prereq.mk tmp/.%info .config
+	mkdir -p tmp
+	rm -f tmp/.host.mk
+	$(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
-	@touch $@
+	touch $@
 
-prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
 
 download: .config FORCE
 	$(MAKE) tools/download
@@ -191,9 +154,9 @@ docclean:
 	$(MAKE) -C docs/ clean
 
 symlinkclean:
-	find package -type l | xargs rm -f
+	-find package -type l | xargs rm -f
+	rm -rf tmp
 
-.SILENT: clean dirclean distclean symlinkclean config-clean download world
+.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
-%: ;