Merge pull request #2746 from mrdudz/bequiet

Fix -s vs QUIET in the makefiles

targettest/Makefile

@@ -47,6 +47,16 @@ else
   LD := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+endif
+
 ifneq ($(filter disk testcode.%,$(MAKECMDGOALS)),)
   ifdef CC65_HOME
     TARGET_PATH = $(CC65_HOME)/target
@@ -120,10 +130,12 @@ DISK_atarixl   = testcode.atr
 %: %.s
 
 .c.o:
+	$(if $(QUIET),echo $(SYS):$*.c)
 	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $<
 	$(AS) $(<:.c=.s)
 
 .s.o:
+	$(if $(QUIET),echo $(SYS):$*.s)
 	$(AS) $(ASFLAGS) -t $(SYS) $<
 
 .PRECIOUS: %.o
@@ -779,7 +791,7 @@ endif
 
 define SUBDIR_recipe
 
-@+$(MAKE) -C $(dir) --no-print-directory $@
+@+$(MAKE) -C $(dir) $(PD) $@ $(PQ)
 
 endef # SUBDIR_recipe
 
@@ -839,25 +851,34 @@ TARGETS :=     \
 # --------------------------------------------------------------------------
 # Rule to make the binaries for every platform
 
+define TARGETDIR_recipe
+
+@+$(MAKE) -C $(dir) $(PD) $(PQ)
+
+endef # TARGETDIR_recipe
+
 define TARGET_recipe
 
 @echo making targettest for: $(T)
 @$(MAKE) -j2 SYS:=$(T)
-@$(MAKE) --no-print-directory clean SYS:=$(T)
+@$(MAKE) $(PD) clean SYS:=$(T)
 
 endef # TARGET_recipe
 
 platforms:
 	$(foreach T,$(TARGETS),$(TARGET_recipe))
+	$(foreach dir,$(DIRLIST),$(TARGETDIR_recipe))
 
 # --------------------------------------------------------------------------
 # some programs link against getsp.o
 
 mouse-test: mouse-test.o getsp.o
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS) -t $(SYS) -o $@ $^ $(SYS).lib
 
 ifneq ($(SYS),vic20)
 ft: ft.o getsp.o
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS) -t $(SYS) -o $@ $^ $(SYS).lib
 endif
 
@@ -865,6 +886,7 @@ endif
 
 ifeq ($(SYS),vic20)
 ft:  ft.o getsp.o
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS) -o $@ -C vic20-32k.cfg -m $@.map $^ $(SYS).lib
 endif