X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9805286b40707a31bdfa39c59afe6c8aecd4e986..e54bff6ab9928d2c5f3262e40d65c529ef677aab:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 447457e26..fea8ed316 100644
--- a/Makefile
+++ b/Makefile
@@ -60,32 +60,32 @@ endif
 
 define dumpinfo
 	@mkdir -p tmp
-	@echo -n Collecting package info... 
+	@echo -n Collecting $(2) info... 
 	@-for dir in $(1)/*/; do \
 		[ -f "$${dir}/Makefile" ] || continue; \
-		$(call progress,Collecting package info... $${dir%%/}) \
+		$(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 package info... done)
-	echo
+	@($(call progress,Collecting $(2) info: done))
+	@echo
 endef
 
 tmp/.pkginfo:
-	$(call dumpinfo,package)
+	$(call dumpinfo,package,package)
 
 tmp/.targetinfo:
-	$(call dumpinfo,target/linux)
+	$(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
@@ -113,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/%,%,$@)
 
@@ -181,6 +185,12 @@ distclean: dirclean config-clean
 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 help