Merge pull request #2755 from mrdudz/quietagain

Some more Makefile woes

Makefile

@@ -4,11 +4,29 @@ ifneq ($(SILENT),s)
     $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
 endif
 
-.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test util checkstyle check
+.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test util checkstyle check checkprefix
 
 .SUFFIXES:
 
-all install zip:
+all:
+	@$(MAKE) -C src         --no-print-directory $@
+	@$(MAKE) -C libsrc      --no-print-directory $@
+	@$(MAKE) -C doc         --no-print-directory $@
+	@$(MAKE) -C util        --no-print-directory $@
+	@$(MAKE) -C samples     --no-print-directory $@
+	@$(MAKE) checkprefix    --no-print-directory
+
+zip:
+	@$(MAKE) -C src         --no-print-directory $@
+	@$(MAKE) -C libsrc      --no-print-directory $@
+	@$(MAKE) -C doc         --no-print-directory $@
+	@$(MAKE) -C util        --no-print-directory $@
+	@$(MAKE) -C samples     --no-print-directory $@
+
+install:
+ifndef PREFIX
+	$(error Error: PREFIX must be set for install to work)
+endif
 	@$(MAKE) -C src        --no-print-directory $@
 	@$(MAKE) -C libsrc     --no-print-directory $@
 	@$(MAKE) -C doc        --no-print-directory $@
@@ -24,9 +42,17 @@ mostlyclean clean:
 	@$(MAKE) -C test       --no-print-directory $@
 	@$(MAKE) -C targettest --no-print-directory $@
 
-avail unavail bin:
+avail unavail:
+# FIXME: actually not true, PREFIX is ignored?
+#ifndef PREFIX
+#    $(error Error: PREFIX must be set for avail/unavail to work)
+#endif
 	@$(MAKE) -C src        --no-print-directory $@
 
+bin:
+	@$(MAKE) -C src         --no-print-directory $@
+	@$(MAKE) checkprefix    --no-print-directory
+
 lib libtest:
 	@$(MAKE) -C libsrc     --no-print-directory $@
 
@@ -45,6 +71,11 @@ util:
 %:
 	@$(MAKE) -C libsrc     --no-print-directory $@
 
+checkprefix:
+ifndef PREFIX
+	$(warning Warning: PREFIX is empty - make install will not work)
+endif
+
 # check the code style
 checkstyle:
 	@$(MAKE) -C .github/checks --no-print-directory $@

src/Makefile

@@ -101,6 +101,11 @@ ifdef CROSS_COMPILE
 endif
 
 all bin: $(PROGS)
+ifeq ($(MAKELEVEL),0)
+ifndef PREFIX
+	$(warning Warning: PREFIX is empty - make install will not work)
+endif
+endif
 
 mostlyclean:
 	$(call RMDIR,../wrk)

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)