More Makefile verbosity

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 3696ce5c05b17fbc98a8a4066c430450dbc58874..451067a93d4df5ed24337b694c23d6891b37063f 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -342,19 +342,33 @@ AWK       = nawk
 # Other things that have to be reconfigured are in config.h,
 # {unixconf.h, pcconf.h, tosconf.h}, and possibly system.h
 
-# Verbosity
+# Verbosity definitions, begin
+#   Set VERBOSEMAKE=1 to output more stuff.
+#   CC and CXX obey verbosity, LD and LINK don't.
+#   AT is @ when not verbose, empty otherwise
 ACTUAL_CC := $(CC)
+ACTUAL_CXX := $(CXX)
+ACTUAL_LD := $(LD)
+ACTUAL_LINK := $(LINK)
+
 CC_V0 = @echo "[CC] $<"; $(ACTUAL_CC)
 CC_V = $(CC_V0)
 CC_V1 = $(ACTUAL_CC)
 CC = $(CC_V$(VERBOSEMAKE))
 
-ACTUAL_CXX := $(CXX)
 CXX_V0 = @echo "[CXX] $<"; $(ACTUAL_CXX)
 CXX_V = $(CXX_V0)
 CXX_V1 = $(ACTUAL_CXX)
 CXX = $(CXX_V$(VERBOSEMAKE))
 
+LD = $(ACTUAL_LD)
+LINK = $(ACTUAL_LINK)
+
+AT_V0 := @
+AT_V := $(AT_V0)
+AT_V1 :=
+AT = $(AT_V$(VERBOSEMAKE))
+# Verbosity, end
 
 MAKEDEFS = ../util/makedefs
 
@@ -454,33 +468,33 @@ $(GAME):  $(SYSTEM)
        @echo "$(GAME) is up to date."
 
 Sysunix:       $(HOBJ) Makefile
-       @echo "Loading ..."
-       @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
+       @echo "Linking $(GAME)."
+       $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
        @touch Sysunix
 
 Sys3B2:        $(HOBJ) Makefile
-       @echo "Loading ..."
-       @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) -lmalloc
+       @echo "Linking $(GAME)."
+       $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) -lmalloc
        @touch Sys3B2
 
 Sysatt:        $(HOBJ) Makefile
-       @echo "Loading ..."
-       @$(LD) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ)
+       @echo "Loading $(GAME)."
+       $(AT)$(LD) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ)
        @touch Sysatt
 
 Systos:        $(HOBJ) Makefile
-       @echo "Loading ..."
-       @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
+       @echo "Linking $(GAME)."
+       $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
        @touch Systos
 
 SysV-AT:       DUMB.Setup $(HOBJ) Makefile
-       @echo "Loading ..."
-       @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
+       @echo "Linking $(GAME)."
+       $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
        @touch SysV-AT
 
 SysBe: $(HOBJ) Makefile
-       @echo "Loading ..."
-       @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
+       @echo "Linking $(GAME)."
+       $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
        @xres -o $(GAME) ../win/BeOS/nethack.rsrc
        @mimeset -f $(GAME)
        @touch SysBe

diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
index dc56d4fdfd28bc55ac19570b97fe36b9e6a4dcfa..224df10a75cd048e43f8bd9bd83ce60cef94ae85 100644 (file)
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -130,19 +130,30 @@ LEXYYC = lex.yy.c
 #
 # Nothing below this line should have to be changed.
 
-# Verbosity
+# Verbosity definitions, begin
 ACTUAL_CC := $(CC)
+ACTUAL_CXX := $(CXX)
+ACTUAL_LD := $(LD)
+ACTUAL_LINK := $(LINK)
+
 CC_V0 = @echo "[CC] $<"; $(ACTUAL_CC)
 CC_V = $(CC_V0)
 CC_V1 = $(ACTUAL_CC)
 CC = $(CC_V$(VERBOSEMAKE))
 
-ACTUAL_CXX := $(CXX)
 CXX_V0 = @echo "[CXX] $<"; $(ACTUAL_CXX)
 CXX_V = $(CXX_V0)
 CXX_V1 = $(ACTUAL_CXX)
 CXX = $(CXX_V$(VERBOSEMAKE))
 
+LD = $(ACTUAL_LD)
+LINK = $(ACTUAL_LINK)
+
+AT_V0 := @
+AT_V := $(AT_V0)
+AT_V1 :=
+AT = V$(AT_$(VERBOSEMAKE))
+# Verbosity, end
 
 # timestamps for primary header files, matching src/Makefile
 CONFIG_H = ../src/config.h-t