From 062ef433f8690566a898e05fdd7c9af342c0d213 Mon Sep 17 00:00:00 2001 From: Holger Dengler Date: Wed, 18 Apr 2018 15:05:30 +0200 Subject: build: cleanup build processing Cleanup build processing: - support quiet and verbose build output (V=0, 1, or 2) - cleanup clean targets - replace for-loops with foreach statements The build process now supports 3 levels of verbosity. Default (V=0) provides very little output of the latex tooling, V=1 adds the full output of the latex tooling and V=2 adds output of the make tooling. Signed-off-by: Holger Dengler --- modules.mk | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'modules.mk') diff --git a/modules.mk b/modules.mk index 011ae92..f807257 100644 --- a/modules.mk +++ b/modules.mk @@ -3,22 +3,20 @@ include Makefile BASE_NAME = $(shell basename $(dir $(CURDIR))) -build: - for files in $(obj-y) ; do \ - ($(MAKE) -C ./ -f $(TOP_DIR)/modules.mk $$files ); \ - cp $$files $(DEPLOY)/ ; \ - done +TMP_TEXFILES = *.aux *.log *.nav *.toc *.pdf *.snm \ + *.bbl *.blg *.out *.vrb *.fls *.fdb_latexmk +build: + $(Q)$(foreach files,$(obj-y),$(MODMK) $(files);) + $(Q)$(foreach files,$(obj-y),cp -t $(DEPLOY) $(files);) ifdef CONFIG_BUILD_HANDOUTS - for files in $(obj-handout-y) ; do \ - ($(MAKE) -C ./ -f $(TOP_DIR)/modules.mk $$files ); \ - cp $$files $(HANDOUT)/ ; \ - done + $(Q)$(foreach files,$(obj-handout-y),$(MODMK) $(files);) + $(Q)$(foreach files,$(obj-handout-y),cp -t $(HANDOUT) $(files);) endif .FORCE: %.pdf: %.tex .FORCE - echo "Build" $@ + $(Q)echo "[LATEXMK]" $@ TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS):`pwd`/distribution/autotools $(BUILD) $< # DON'T delete this empty target! Need for incremental build @@ -26,17 +24,6 @@ endif clean_texfiles: - rm -f *.aux - rm -f *.log - rm -f *.nav - rm -f *.toc - rm -f *.pdf - rm -f *.snm - rm -f *.bbl - rm -f *.blg - rm -f *.out - rm -f *.vrb - rm -f *.fls - rm -f *.fdb_latexmk + $(Q)rm -f $(TMP_TEXFILES) .PHONY: clean_texfiles build -- cgit v1.2.3