X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/432ce85854aea17f9383519db1c2d3a8307c0760..84fdb577b9f2afa1f1c7ffb7eff9e98047331552:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index a23f478d7..f06b151eb 100644
--- a/Makefile
+++ b/Makefile
@@ -14,119 +14,149 @@ RELEASE:=Kamikaze
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
-TOPDIR=${shell pwd}
-export TOPDIR
+
+all: world
+
+SHELL:=/usr/bin/env bash
+export LC_ALL=C
+export LANG=C
+export TOPDIR=${CURDIR}
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+
 include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
-OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
 else
-REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-ifneq ($(REV),)
-OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-endif
+  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
+  ifneq ($(REV),)
+    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
+  endif
 endif
 export OPENWRTVERSION
 
-all: world
-
-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
-.pkginfo: FORCE
-.config: FORCE
+ifeq ($(FORCE),)
+  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
+  world: tmp/.prereq-package tmp/.prereq-target
 endif
 
-.pkginfo:
-	@echo Collecting package info...
-	@-for dir in package/*/; do \
-		echo Source-Makefile: $${dir}Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
-	done > $@
+package/%/Makefile: ;
+target/%/Makefile: ;
+
+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="$(filter-out FORCE, $^)" SCAN_EXTRA=""
+
+tmpinfo-clean: FORCE
+	-rm -rf tmp/.*info
 
-.config.in: .pkginfo
-	@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
+tmp/.config-%.in: tmp/.%info scripts/metadata.pl
+	./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
 
-pkginfo-clean: FORCE
-	-rm -f .pkginfo .config.in
+.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: .config.in
-	@$(MAKE) -C scripts/config all
+scripts/config/mconf:
+	$(MAKE) -C scripts/config all
 
-./scripts/config/conf: .config.in
-	@$(MAKE) -C scripts/config conf
+scripts/config/conf:
+	$(MAKE) -C scripts/config conf
 
-config: ./scripts/config/conf FORCE
+
+
+config: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
 	$< Config.in
 
-defconfig: ./scripts/config/conf FORCE
+config-clean: FORCE
+	$(NO_TRACE_MAKE) -C scripts/config clean
+
+defconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
 	touch .config
 	$< -D .config Config.in
 
-oldconfig: ./scripts/config/conf FORCE
+oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
 	$< -o Config.in
 
-menuconfig: ./scripts/config/mconf 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
 
-config-clean: FORCE
-	$(NO_TRACE_MAKE) -C scripts/config clean
-
-package/%: .pkginfo FORCE
-	$(MAKE) -C package $(patsubst package/%,%,$@)
+kernel_menuconfig: .config FORCE
+	-$(MAKE) target/linux-prepare
+	$(NO_TRACE_MAKE) -C target/linux menuconfig
 
-target/%: .pkginfo FORCE
-	$(MAKE) -C target $(patsubst target/%,%,$@)
 
-toolchain/%: FORCE
-	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+package/% target/%: tmp/.packageinfo
+toolchain/% package/% target/%: tmp/.targetinfo
+package/% target/% tools/% toolchain/%: FORCE
+	$(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-.config: ./scripts/config/conf
-	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-	@$< -D .config Config.in &> /dev/null
 
-.prereq-build: $(TOPDIR)/include/prereq-build.mk
-	@$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
+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 $@
+	touch $@
 
-.prereq-packages: $(TOPDIR)/include/prereq.mk .pkginfo .config
-	@$(NO_TRACE_MAKE) -s -C package 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 $@
-	
-prereq: .prereq-build .prereq-packages FORCE
+	touch $@
+
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
 
 download: .config FORCE
+	$(MAKE) tools/download
 	$(MAKE) toolchain/download
 	$(MAKE) package/download
 	$(MAKE) target/download
 
-ifeq ($(FORCE),)
-.config ./scripts/config/conf ./scripts/config/mconf: .prereq-build
-world: .prereq-packages
-endif
-
 world: .config FORCE
+	$(MAKE) tools/install
 	$(MAKE) toolchain/install
 	$(MAKE) target/compile
 	$(MAKE) package/compile
 	$(MAKE) package/install
 	$(MAKE) target/install
+	$(MAKE) package/index
 
 clean: FORCE
-	rm -rf build_* bin
+	rm -rf build_* bin tmp
 
 dirclean: clean
-	rm -rf staging_dir_* toolchain_build_*
+	rm -rf staging_dir_* toolchain_build_* tool_build
+
+distclean: dirclean config-clean symlinkclean docclean
+	rm -rf dl
+
+help:
+	cat README
+
+doc:
+	$(MAKE) -C docs/ openwrt.pdf
 
-distclean: dirclean config-clean
-	rm -rf dl .*config* .pkg* .prereq
+docclean:
+	$(MAKE) -C docs/ clean
 
+symlinkclean:
+	-find package -type l | xargs rm -f
 
-.SILENT: clean dirclean distclean config-clean download world
-.PHONY: FORCE
-FORCE:
+.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