make propagating QUIET=1 down actually work, also set --no-print-directory depending on QUIET
This commit is contained in:
@@ -17,11 +17,12 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(SILENT),s)
|
ifeq ($(SILENT),s)
|
||||||
QUIET := 1
|
QUIET = 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(QUIET),1)
|
ifdef QUIET
|
||||||
QUIET := 0
|
PQ = "QUIET=1"
|
||||||
|
PD = --no-print-directory
|
||||||
endif
|
endif
|
||||||
|
|
||||||
WORKDIR = ../testwrk
|
WORKDIR = ../testwrk
|
||||||
@@ -33,15 +34,15 @@ test:
|
|||||||
@$(MAKE) continue
|
@$(MAKE) continue
|
||||||
|
|
||||||
continue:
|
continue:
|
||||||
@$(MAKE) -C asm all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C asm all $(PQ)
|
||||||
@$(MAKE) -C dasm all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C dasm all $(PQ)
|
||||||
@$(MAKE) -C val all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C val all $(PQ)
|
||||||
@$(MAKE) -C ref all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C ref all $(PQ)
|
||||||
@$(MAKE) -C err all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C err all $(PQ)
|
||||||
@$(MAKE) -C standard all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C standard all $(PQ)
|
||||||
@$(MAKE) -C standard_err all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C standard_err all $(PQ)
|
||||||
@$(MAKE) -C misc all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C misc all $(PQ)
|
||||||
@$(MAKE) -C todo all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C todo all $(PQ)
|
||||||
@$(MAKE) success_message
|
@$(MAKE) success_message
|
||||||
|
|
||||||
success_message:
|
success_message:
|
||||||
@@ -50,15 +51,15 @@ success_message:
|
|||||||
$(info ###################################)
|
$(info ###################################)
|
||||||
|
|
||||||
mostlyclean:
|
mostlyclean:
|
||||||
@$(MAKE) -C asm clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C asm clean $(PQ)
|
||||||
@$(MAKE) -C dasm clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C dasm clean $(PQ)
|
||||||
@$(MAKE) -C val clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C val clean $(PQ)
|
||||||
@$(MAKE) -C ref clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C ref clean $(PQ)
|
||||||
@$(MAKE) -C err clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C err clean $(PQ)
|
||||||
@$(MAKE) -C standard clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C standard clean $(PQ)
|
||||||
@$(MAKE) -C standard_err clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C standard_err clean $(PQ)
|
||||||
@$(MAKE) -C misc clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C misc clean $(PQ)
|
||||||
@$(MAKE) -C todo clean QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C todo clean $(PQ)
|
||||||
|
|
||||||
clean: mostlyclean
|
clean: mostlyclean
|
||||||
@$(call RMDIR,$(WORKDIR))
|
@$(call RMDIR,$(WORKDIR))
|
||||||
|
|||||||
@@ -20,8 +20,9 @@ ifeq ($(SILENT),s)
|
|||||||
QUIET := 1
|
QUIET := 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(QUIET),1)
|
ifdef QUIET
|
||||||
QUIET := 0
|
PQ = "QUIET=1"
|
||||||
|
PD = --no-print-directory
|
||||||
endif
|
endif
|
||||||
|
|
||||||
WORKDIR = ../testwrk/asm
|
WORKDIR = ../testwrk/asm
|
||||||
@@ -31,20 +32,20 @@ WORKDIR = ../testwrk/asm
|
|||||||
all: mostlyclean continue
|
all: mostlyclean continue
|
||||||
|
|
||||||
continue: mostlyclean
|
continue: mostlyclean
|
||||||
@$(MAKE) --no-print-directory -C cpudetect all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C cpudetect all $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C opcodes all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C opcodes all $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C listing all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C listing all $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C val all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C val all $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C err all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C err all $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C misc all QUIET=$(QUIET)
|
@$(MAKE) $(PD) -C misc all $(PQ)
|
||||||
|
|
||||||
mostlyclean:
|
mostlyclean:
|
||||||
@$(MAKE) --no-print-directory -C cpudetect clean
|
@$(MAKE) $(PD) -C cpudetect clean $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C opcodes clean
|
@$(MAKE) $(PD) -C opcodes clean $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C listing clean
|
@$(MAKE) $(PD) -C listing clean $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C val clean
|
@$(MAKE) $(PD) -C val clean $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C err clean
|
@$(MAKE) $(PD) -C err clean $(PQ)
|
||||||
@$(MAKE) --no-print-directory -C misc clean
|
@$(MAKE) $(PD) -C misc clean $(PQ)
|
||||||
|
|
||||||
clean: mostlyclean
|
clean: mostlyclean
|
||||||
@$(call RMDIR,$(WORKDIR))
|
@$(call RMDIR,$(WORKDIR))
|
||||||
|
|||||||
Reference in New Issue
Block a user