X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5be70dfb578c8793084aa8b4526fad08d68a6155..fb20784ee57e077def310a89faaf4107a13df24c:/Makefile

diff --git a/Makefile b/Makefile
index eed9335a5..bee47c45c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ all: world
 SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
-export TOPDIR=${shell pwd}
+export TOPDIR=${CURDIR}
 ifeq ($(KBUILD_VERBOSE),99)
   MAKE:=3>/dev/null $(MAKE)
 endif
@@ -39,46 +39,27 @@ else
 endif
 export OPENWRTVERSION
 
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts include),tmp/.pkginfo)
-  tmp/.pkginfo: FORCE
-endif
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts include),tmp/.targetinfo)
-  tmp/.targetinfo: FORCE
-endif
-
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-  world: tmp/.prereq-packages
+  world: tmp/.prereq-packages tmp/.prereq-target
 endif
 
-tmp/.pkginfo:
-	@mkdir -p tmp
-	@echo Collecting package info...
-	@-for dir in package/*/; do \
-		[ -f "$${dir}/Makefile" ] || continue; \
-		echo Source-Makefile: $${dir}Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
-		echo; \
-	done > $@
-
-tmp/.targetinfo:
-	@mkdir -p tmp
-	@echo Collecting target info...
-	@-for dir in target/linux/*/; do \
-		[ -f "$${dir}/Makefile" ] || continue; \
-		( cd "$$dir"; $(NO_TRACE_MAKE) --no-print-dir DUMP=1 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2 ); \
-		echo; \
-	done > $@
+tmp/.pkginfo: FORCE
+	@mkdir -p tmp/info
+	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(shell ls include/package*.mk) include/kernel.mk" SCAN_EXTRA=""
+
+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="$(shell ls include/kernel*.mk)" SCAN_EXTRA=""
 
 tmpinfo-clean: FORCE
 	@-rm -rf tmp/.pkginfo tmp/.targetinfo
 
 tmp/.config.in: tmp/.pkginfo
-	@./scripts/gen_package_config.pl < $< > $@ || rm -f $@
+	@./scripts/metadata.pl package_config < $< > $@ || rm -f $@
 
 tmp/.config-target.in: tmp/.targetinfo
-	@./scripts/gen_target_config.pl < $< > $@ || rm -f $@
+	@./scripts/metadata.pl target_config < $< > $@ || rm -f $@
 
 .config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
 	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
@@ -106,10 +87,19 @@ oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
 menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
 	$< Config.in
 
-package/%: tmp/.pkginfo tmp/.targetinfo FORCE
+kernel_menuconfig: .config FORCE
+	-$(MAKE) target/linux-prepare
+	$(NO_TRACE_MAKE) -C target/linux menuconfig
+
+scan_packages:
+	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
+	
+
+package/%: scan_packages
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%: tmp/.pkginfo tmp/.targetinfo FORCE
+target/%: scan_packages
+	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
 tools/%: FORCE
@@ -120,6 +110,7 @@ toolchain/%: tmp/.targetinfo FORCE
 
 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; \
@@ -128,13 +119,23 @@ tmp/.prereq-build: include/prereq-build.mk
 
 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 || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
 	@touch $@
-	
-prereq: tmp/.prereq-build tmp/.prereq-packages FORCE
+
+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 || { \
+		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		false; \
+	}
+	@touch $@
+
+prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE
 
 download: .config FORCE
 	$(MAKE) tools/download
@@ -157,10 +158,22 @@ clean: FORCE
 dirclean: clean
 	rm -rf staging_dir_* toolchain_build_* tool_build
 
-distclean: dirclean config-clean
+distclean: dirclean config-clean symlinkclean docclean
 	rm -rf dl
 
-.SILENT: clean dirclean distclean config-clean download world
+help:
+	cat README
+
+doc:
+	$(MAKE) -C docs/ openwrt.pdf
+
+docclean:
+	$(MAKE) -C docs/ clean
+
+symlinkclean:
+	find package -type l | xargs rm -f
+
+.SILENT: clean dirclean distclean symlinkclean config-clean download world
 FORCE: ;
-.PHONY: FORCE
+.PHONY: FORCE help
 %: ;