nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

More Makefile verbosity

Browse Source
This commit is contained in:
Pasi Kallinen
2017-10-15 18:00:56 +03:00
parent 612a0cb909
commit 1af921274e
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/Makefile.src
+28 -14
View File
@@ -342,19 +342,33 @@ AWK = nawk
# Other things that have to be reconfigured are in config.h, # Other things that have to be reconfigured are in config.h,
# {unixconf.h, pcconf.h, tosconf.h}, and possibly system.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_CC := $(CC)
ACTUAL_CXX := $(CXX)
ACTUAL_LD := $(LD)
ACTUAL_LINK := $(LINK)
CC_V0 = @echo "[CC] $<"; $(ACTUAL_CC) CC_V0 = @echo "[CC] $<"; $(ACTUAL_CC)
CC_V = $(CC_V0) CC_V = $(CC_V0)
CC_V1 = $(ACTUAL_CC) CC_V1 = $(ACTUAL_CC)
CC = $(CC_V$(VERBOSEMAKE)) CC = $(CC_V$(VERBOSEMAKE))
ACTUAL_CXX := $(CXX)
CXX_V0 = @echo "[CXX] $<"; $(ACTUAL_CXX) CXX_V0 = @echo "[CXX] $<"; $(ACTUAL_CXX)
CXX_V = $(CXX_V0) CXX_V = $(CXX_V0)
CXX_V1 = $(ACTUAL_CXX) CXX_V1 = $(ACTUAL_CXX)
CXX = $(CXX_V$(VERBOSEMAKE)) 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 MAKEDEFS = ../util/makedefs
@@ -454,33 +468,33 @@ $(GAME): $(SYSTEM)
@echo "$(GAME) is up to date." @echo "$(GAME) is up to date."
Sysunix: $(HOBJ) Makefile Sysunix: $(HOBJ) Makefile
@echo "Loading ..." @echo "Linking $(GAME)."
@$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
@touch Sysunix @touch Sysunix
Sys3B2: $(HOBJ) Makefile Sys3B2: $(HOBJ) Makefile
@echo "Loading ..." @echo "Linking $(GAME)."
@$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) -lmalloc $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) -lmalloc
@touch Sys3B2 @touch Sys3B2
Sysatt: $(HOBJ) Makefile Sysatt: $(HOBJ) Makefile
@echo "Loading ..." @echo "Loading $(GAME)."
@$(LD) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ) $(AT)$(LD) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ)
@touch Sysatt @touch Sysatt
Systos: $(HOBJ) Makefile Systos: $(HOBJ) Makefile
@echo "Loading ..." @echo "Linking $(GAME)."
@$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
@touch Systos @touch Systos
SysV-AT: DUMB.Setup $(HOBJ) Makefile SysV-AT: DUMB.Setup $(HOBJ) Makefile
@echo "Loading ..." @echo "Linking $(GAME)."
@$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
@touch SysV-AT @touch SysV-AT
SysBe: $(HOBJ) Makefile SysBe: $(HOBJ) Makefile
@echo "Loading ..." @echo "Linking $(GAME)."
@$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) $(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
@xres -o $(GAME) ../win/BeOS/nethack.rsrc @xres -o $(GAME) ../win/BeOS/nethack.rsrc
@mimeset -f $(GAME) @mimeset -f $(GAME)
@touch SysBe @touch SysBe
sys/unix/Makefile.utl
+13 -2
View File
@@ -130,19 +130,30 @@ LEXYYC = lex.yy.c
# #
# Nothing below this line should have to be changed. # Nothing below this line should have to be changed.
# Verbosity # Verbosity definitions, begin
ACTUAL_CC := $(CC) ACTUAL_CC := $(CC)
ACTUAL_CXX := $(CXX)
ACTUAL_LD := $(LD)
ACTUAL_LINK := $(LINK)
CC_V0 = @echo "[CC] $<"; $(ACTUAL_CC) CC_V0 = @echo "[CC] $<"; $(ACTUAL_CC)
CC_V = $(CC_V0) CC_V = $(CC_V0)
CC_V1 = $(ACTUAL_CC) CC_V1 = $(ACTUAL_CC)
CC = $(CC_V$(VERBOSEMAKE)) CC = $(CC_V$(VERBOSEMAKE))
ACTUAL_CXX := $(CXX)
CXX_V0 = @echo "[CXX] $<"; $(ACTUAL_CXX) CXX_V0 = @echo "[CXX] $<"; $(ACTUAL_CXX)
CXX_V = $(CXX_V0) CXX_V = $(CXX_V0)
CXX_V1 = $(ACTUAL_CXX) CXX_V1 = $(ACTUAL_CXX)
CXX = $(CXX_V$(VERBOSEMAKE)) 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 # timestamps for primary header files, matching src/Makefile
CONFIG_H = ../src/config.h-t CONFIG_H = ../src/config.h-t