X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/23ac60b66ca9d7567696ed47f76a25c4fb4dc6aa..25dc2c8560b103ba0472fa49653f980f975214c9:/Makefile

diff --git a/Makefile b/Makefile
index e97423ee6..8bd0bc710 100644
--- a/Makefile
+++ b/Makefile
@@ -52,24 +52,31 @@ 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
@@ -171,7 +178,10 @@ dirclean: clean
 distclean: dirclean config-clean
 	rm -rf dl
 
+help:
+	cat README
+
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;
-.PHONY: FORCE
+.PHONY: FORCE help
 %: ;