Merge pull request #2755 from mrdudz/quietagain

Some more Makefile woes
2025-06-30 00:15:19 +02:00
parent a7a76b0e50 13878070e5
commit 8e62d3d440
17 changed files with 112 additions and 18 deletions
--- a/61
+++ b/61
@@ -4,16 +4,34 @@ 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:
-	@$(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 $@
+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 $@
+	@$(MAKE) -C util       --no-print-directory $@
+	@$(MAKE) -C samples    --no-print-directory $@

 mostlyclean clean:
 	@$(MAKE) -C src        --no-print-directory $@
@@ -24,26 +42,39 @@ mostlyclean clean:
 	@$(MAKE) -C test       --no-print-directory $@
 	@$(MAKE) -C targettest --no-print-directory $@

-avail unavail bin:
-	@$(MAKE) -C src     --no-print-directory $@
+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 $@
+	@$(MAKE) -C libsrc     --no-print-directory $@

 doc html info:
-	@$(MAKE) -C doc     --no-print-directory $@
+	@$(MAKE) -C doc        --no-print-directory $@

 samples:
-	@$(MAKE) -C samples --no-print-directory $@
+	@$(MAKE) -C samples    --no-print-directory $@

 util:
-	@$(MAKE) -C util    --no-print-directory $@
+	@$(MAKE) -C util       --no-print-directory $@

 %65:
-	@$(MAKE) -C src     --no-print-directory $@
+	@$(MAKE) -C src        --no-print-directory $@

 %:
-	@$(MAKE) -C libsrc  --no-print-directory $@
+	@$(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:
--- a/src/Makefile
+++ b/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)
--- a/targettest/Makefile
+++ b/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) $<
-	$(AS) $(<:.c=.s)
+	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $< $(CATERR)
+	$(AS) $(<:.c=.s) $(CATERR)

 .s.o:
 	$(if $(QUIET),echo $(SYS):$*.s)
-	$(AS) $(ASFLAGS) -t $(SYS) $<
+	$(AS) $(ASFLAGS) -t $(SYS) $< $(CATERR)

 .PRECIOUS: %.o

--- a/test/asm/cpudetect/Makefile
+++ b/test/asm/cpudetect/Makefile
@@ -20,6 +20,9 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif

 ifdef QUIET
  .SILENT:
--- a/test/asm/err/Makefile
+++ b/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)
--- a/test/asm/listing/Makefile
+++ b/test/asm/listing/Makefile
@@ -28,6 +28,10 @@ else
  NULLDEV = /dev/null
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/asm/misc/Makefile
+++ b/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)
--- a/test/asm/opcodes/Makefile
+++ b/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)
--- a/test/asm/val/Makefile
+++ b/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)
--- a/test/dasm/Makefile
+++ b/test/dasm/Makefile
@@ -22,6 +22,10 @@ else
  NULLDEV = /dev/null
 endif

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

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

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

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

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/standard_err/Makefile
+++ b/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)
--- a/test/todo/Makefile
+++ b/test/todo/Makefile
@@ -24,6 +24,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/val/Makefile
+++ b/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)