From: PatR Date: Sun, 4 Oct 2020 23:34:59 +0000 (-0700) Subject: Makefile.src: avoid extra feedback while linking X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49ef50fc54b9b4917c1e5bcaea1d6f3b235e6de7;p=nethack Makefile.src: avoid extra feedback while linking Recently added cross-compile stuff had resulted in an extra line of feedback when linking: 'true;'. Suppress that. Also, I think 'AWK=nawk' was needed for Solaris or maybe even SunOS. Switch 'make depend' to use ordinary awk by default since most systems have Posix-compliant awk these days and OSX doesn't have nawk. --- diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 8977c5127..2e4be5114 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -1,5 +1,5 @@ # NetHack Makefile. -# NetHack 3.7 Makefile.src $NHDT-Date: 1600904413 2020/09/23 23:40:13 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.108 $ +# NetHack 3.7 Makefile.src $NHDT-Date: 1601854487 2020/10/04 23:34:47 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.111 $ # Copyright (c) 2018 by Pasi Kallinen # NetHack may be freely redistributed. See license for details. @@ -425,9 +425,9 @@ GAMEBIN = $(GAME) # RANDOBJ = $(TARGETPFX)random.o RANDOBJ = - # used by `make depend' to reconstruct this Makefile; you shouldn't need this -AWK = nawk +# at all but can override with 'make AWK=nawk' or 'make AWK=gawk' if necessary +AWK = awk # when using 'makedefs -v', also force dat/gitinfo.txt to be up to date; # changing this to 0 will change the behavior to only make that file if @@ -487,6 +487,13 @@ AT_V1 := @ AT = $(AT_V$(QUIETCC)) # Verbosity, end +# verbosity-adjacent; these will already have 'real' values if hints have +# set up cross-compiling, in which case these assignments will be no-ops +PREGAME=@true +CLEANMORE=@true +PACKAGE=@true + + MAKEDEFS = ../util/makedefs # -lm required by lua @@ -615,7 +622,7 @@ all: $(GAME) @echo "" pregame: - true; $(PREGAME) + $(PREGAME) $(GAME): pregame $(SYSTEM) @echo "$(GAME) is up to date." @@ -790,7 +797,7 @@ tags: $(CSOURCES) clean: -rm -f *.o $(HACK_H) $(CONFIG_H) - true; $(CLEANMORE) + $(CLEANMORE) spotless: clean -rm -f a.out core $(GAMEBIN) Sys* @@ -800,7 +807,7 @@ spotless: clean -rm -f ../win/gnome/gn_rip.h package: - true; $(PACKAGE) + $(PACKAGE) @echo packaging complete. depend: ../sys/unix/depend.awk \