handle -s correctly when using these makefiles directly

targettest/Makefile

@@ -55,6 +55,9 @@ ifdef QUIET
     .SILENT:
     PQ = "QUIET=1"
     PD = --no-print-directory
+ifndef CMD_EXE
+  CATERR = 2> $$@.errlog || (cat $$@.errlog && false)
+endif
 endif
 
 ifneq ($(filter disk testcode.%,$(MAKECMDGOALS)),)
@@ -131,12 +134,12 @@ DISK_atarixl   = testcode.atr
 
 .c.o:
 	$(if $(QUIET),echo $(SYS):$*.c)
-	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $<
+	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $< $(CATERR)
-	$(AS) $(<:.c=.s)
+	$(AS) $(<:.c=.s) $(CATERR)
 
 .s.o:
 	$(if $(QUIET),echo $(SYS):$*.s)
-	$(AS) $(ASFLAGS) -t $(SYS) $<
+	$(AS) $(ASFLAGS) -t $(SYS) $< $(CATERR)
 
 .PRECIOUS: %.o
 

test/asm/cpudetect/Makefile

@@ -20,6 +20,9 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
 
 ifdef QUIET
   .SILENT:

test/asm/err/Makefile

@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/asm/listing/Makefile

@@ -28,6 +28,10 @@ else
   NULLDEV = /dev/null
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/asm/misc/Makefile

@@ -26,6 +26,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/asm/opcodes/Makefile

@@ -20,6 +20,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/asm/val/Makefile

@@ -22,6 +22,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/dasm/Makefile

@@ -22,6 +22,10 @@ else
   NULLDEV = /dev/null
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/err/Makefile

@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/misc/Makefile

@@ -26,6 +26,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/ref/Makefile

@@ -27,6 +27,10 @@ else
   COPY = cp $1 $2
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/standard/Makefile

@@ -22,6 +22,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/standard_err/Makefile

@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/todo/Makefile

@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)

test/val/Makefile

@@ -24,6 +24,10 @@ else
   CATRES = > $(WORKDIR)/$$@.out 2> $(WORKDIR)/$$@.out || (cat $(WORKDIR)/$$@.out && false)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)