when -s was used, implicitly use QUIET=1. also explicitly propagate QUIET to submakefile(s)

This commit is contained in:
mrdudz
2025-06-26 18:42:01 +02:00
parent 4f5fc898d7
commit 75aa45d41e
2 changed files with 46 additions and 30 deletions

View File

@@ -16,6 +16,14 @@ else
RMDIR = $(RM) -r $1 RMDIR = $(RM) -r $1
endif endif
ifeq ($(SILENT),s)
QUIET := 1
endif
ifneq ($(QUIET),1)
QUIET := 0
endif
WORKDIR = ../testwrk WORKDIR = ../testwrk
.PHONY: test continue mostlyclean clean success_message .PHONY: test continue mostlyclean clean success_message
@@ -25,15 +33,15 @@ test:
@$(MAKE) continue @$(MAKE) continue
continue: continue:
@$(MAKE) -C asm all @$(MAKE) -C asm all QUIET=$(QUIET)
@$(MAKE) -C dasm all @$(MAKE) -C dasm all QUIET=$(QUIET)
@$(MAKE) -C val all @$(MAKE) -C val all QUIET=$(QUIET)
@$(MAKE) -C ref all @$(MAKE) -C ref all QUIET=$(QUIET)
@$(MAKE) -C err all @$(MAKE) -C err all QUIET=$(QUIET)
@$(MAKE) -C standard all @$(MAKE) -C standard all QUIET=$(QUIET)
@$(MAKE) -C standard_err all @$(MAKE) -C standard_err all QUIET=$(QUIET)
@$(MAKE) -C misc all @$(MAKE) -C misc all QUIET=$(QUIET)
@$(MAKE) -C todo all @$(MAKE) -C todo all QUIET=$(QUIET)
@$(MAKE) success_message @$(MAKE) success_message
success_message: success_message:
@@ -42,15 +50,15 @@ success_message:
$(info ###################################) $(info ###################################)
mostlyclean: mostlyclean:
@$(MAKE) -C asm clean @$(MAKE) -C asm clean QUIET=$(QUIET)
@$(MAKE) -C dasm clean @$(MAKE) -C dasm clean QUIET=$(QUIET)
@$(MAKE) -C val clean @$(MAKE) -C val clean QUIET=$(QUIET)
@$(MAKE) -C ref clean @$(MAKE) -C ref clean QUIET=$(QUIET)
@$(MAKE) -C err clean @$(MAKE) -C err clean QUIET=$(QUIET)
@$(MAKE) -C standard clean @$(MAKE) -C standard clean QUIET=$(QUIET)
@$(MAKE) -C standard_err clean @$(MAKE) -C standard_err clean QUIET=$(QUIET)
@$(MAKE) -C misc clean @$(MAKE) -C misc clean QUIET=$(QUIET)
@$(MAKE) -C todo clean @$(MAKE) -C todo clean QUIET=$(QUIET)
clean: mostlyclean clean: mostlyclean
@$(call RMDIR,$(WORKDIR)) @$(call RMDIR,$(WORKDIR))

View File

@@ -16,6 +16,14 @@ else
RMDIR = $(RM) -r $1 RMDIR = $(RM) -r $1
endif endif
ifeq ($(SILENT),s)
QUIET := 1
endif
ifneq ($(QUIET),1)
QUIET := 0
endif
WORKDIR = ../testwrk/asm WORKDIR = ../testwrk/asm
.PHONY: all continue mostlyclean clean .PHONY: all continue mostlyclean clean
@@ -23,20 +31,20 @@ WORKDIR = ../testwrk/asm
all: mostlyclean continue all: mostlyclean continue
continue: mostlyclean continue: mostlyclean
@$(MAKE) -C cpudetect all @$(MAKE) --no-print-directory -C cpudetect all QUIET=$(QUIET)
@$(MAKE) -C opcodes all @$(MAKE) --no-print-directory -C opcodes all QUIET=$(QUIET)
@$(MAKE) -C listing all @$(MAKE) --no-print-directory -C listing all QUIET=$(QUIET)
@$(MAKE) -C val all @$(MAKE) --no-print-directory -C val all QUIET=$(QUIET)
@$(MAKE) -C err all @$(MAKE) --no-print-directory -C err all QUIET=$(QUIET)
@$(MAKE) -C misc all @$(MAKE) --no-print-directory -C misc all QUIET=$(QUIET)
mostlyclean: mostlyclean:
@$(MAKE) -C cpudetect clean @$(MAKE) --no-print-directory -C cpudetect clean
@$(MAKE) -C opcodes clean @$(MAKE) --no-print-directory -C opcodes clean
@$(MAKE) -C listing clean @$(MAKE) --no-print-directory -C listing clean
@$(MAKE) -C val clean @$(MAKE) --no-print-directory -C val clean
@$(MAKE) -C err clean @$(MAKE) --no-print-directory -C err clean
@$(MAKE) -C misc clean @$(MAKE) --no-print-directory -C misc clean
clean: mostlyclean clean: mostlyclean
@$(call RMDIR,$(WORKDIR)) @$(call RMDIR,$(WORKDIR))