X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/23ac60b66ca9d7567696ed47f76a25c4fb4dc6aa..cd23d9d0f296226f8983f580fc3125dd6b91a769:/Makefile

diff --git a/Makefile b/Makefile
index e97423ee6..b1970b09c 100644
--- a/Makefile
+++ b/Makefile
@@ -52,33 +52,40 @@ ifeq ($(FORCE),)
   world: tmp/.prereq-packages tmp/.prereq-target
 endif
 
-tmp/.pkginfo:
+ifeq ($(IS_TTY),1)
+  define progress
+	printf "\033[M\r$(1)" >&2;
+  endef
+endif
+
+define dumpinfo
 	@mkdir -p tmp
-	@echo Collecting package info...
-	@-for dir in package/*/; do \
+	@echo -n Collecting $(2) info... 
+	@-for dir in $(1)/*/; do \
 		[ -f "$${dir}/Makefile" ] || continue; \
+		$(call progress,Collecting $(2) info: $${dir%%/}) \
 		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 > $@
+	@($(call progress,Collecting $(2) info: done))
+	@echo
+endef
+
+tmp/.pkginfo:
+	$(call dumpinfo,package,package)
 
 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 > $@
+	$(call dumpinfo,target/linux,target)
 
 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,6 +113,10 @@ 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
 
+kernel_menuconfig: .config FORCE
+	$(MAKE) target/linux-prepare
+	$(NO_TRACE_MAKE) -C target/linux menuconfig
+
 package/%: tmp/.pkginfo tmp/.targetinfo FORCE
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
@@ -171,7 +182,16 @@ dirclean: clean
 distclean: dirclean config-clean
 	rm -rf dl
 
+help:
+	cat README
+
+doc:
+	$(MAKE) -C docs/ openwrt.pdf
+
+docclean:
+	$(MAKE) -C docs/ clean
+
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;
-.PHONY: FORCE
+.PHONY: FORCE help
 %: ;