diff options
| author | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-10-04 13:26:44 +0000 |
|---|---|---|
| committer | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-10-04 13:26:44 +0000 |
| commit | eebd27eee512f591ce6c7c640c614290604fe464 (patch) | |
| tree | 26692002bc4890a263cb4825f41e2c1322cb3270 | |
| parent | 643410515c22de2945df896974b44c9ca2c6051e (diff) | |
- fix several issues with recent VERBOSE change
- re-introduce SILENT=no to set VERBOSE=yes, for some time
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4740 17b73243-c579-4c4c-a9d2-2d5706c11dac
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | lib/make/make.config.rules.in | 30 | ||||
| -rw-r--r-- | lib/make/make.configuration | 9 | ||||
| -rw-r--r-- | lib/make/make.thornlib | 8 |
4 files changed, 43 insertions, 16 deletions
@@ -40,6 +40,10 @@ endif export PROMPT +# backwards compatibility for VERBOSE=yes (SILENT=no) +ifeq ($(shell echo $(strip $(SILENT)) | tr '[:upper:]' '[:lower:]'),no) +VERBOSE = yes +endif # Make quietly unless told not to ifneq ($(shell echo $(strip $(VERBOSE)) | tr '[:upper:]' '[:lower:]'),yes) .SILENT: @@ -191,9 +195,15 @@ BUILD_ACTIVETHORNS = lib/sbin/BuildActiveThorns.pl # Dividers to make the screen output slightly nicer DIVEL = __________________ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) +ifeq ($(shell echo $(VERBOSE) | tr '[:upper:]' '[:lower:]'),yes) define NOTIFY_DIVIDER - { if test "$(BRIEF)" != "yes"; then echo $(DIVIDER); fi } + echo $(DIVIDER) endef +else +define NOTIFY_DIVIDER + : +endef +endif # Work out where we are export CCTK_HOME := $(shell pwd) diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index e6b7637d..cec72a91 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -29,27 +29,35 @@ INCLUDE_LINE = $(patsubst %,-I"%",$(call TRANSFORM_DIRS,$(INC_DIRS))) ##################################################################### +ifeq ($(shell echo $(VERBOSE) | tr '[:upper:]' '[:lower:]'),yes) define NOTIFY_PREPROCESSING - VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ - if test "$(VERBOSE)" = "yes"; then echo Preprocessing $<; fi + echo Preprocessing $< endef define NOTIFY_COPYING - VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ - if test "$(VERBOSE)" = "yes"; then echo Copying $<; fi + echo Copying $< endef define NOTIFY_COMPILING - VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ - if test "$(VERBOSE)" = "yes"; then echo Compiling $<; \ - else echo COMPILING $<; fi + echo Compiling $< endef define NOTIFY_POSTPROCESSING - VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ - if test "$(VERBOSE)" = "yes"; then echo Postprocessing $<; fi + echo Postprocessing $< endef define NOTIFY_DIVIDER - VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ - if test "$(VERBOSE)" = "yes"; then echo $(DIVIDER); fi + echo $(DIVIDER) endef +else +define NOTIFY_PREPROCESSING +endef +define NOTIFY_COPYING +endef +define NOTIFY_COMPILING + echo COMPILING $< +endef +define NOTIFY_POSTPROCESSING +endef +define NOTIFY_DIVIDER +endef +endif # Define how to do dependencies ifeq ($(strip $(PERL_BACKUP_NECESSARY)),) diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 87660cec..9406b2a6 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -45,10 +45,15 @@ CACTUSLIBS = $(FLESHLIB) $(BINDINGSLIB) # Dividers to make the screen output slightly nicer DIVEL = __________________ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) +ifeq ($(shell echo $(VERBOSE) | tr '[:upper:]' '[:lower:]'),yes) define NOTIFY_DIVIDER - VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ - if test "$(VERBOSE)" = "yes"; then echo $(DIVIDER); fi + echo $(DIVIDER) endef +else +define NOTIFY_DIVIDER + : +endef +endif # Include the definitions for this configuration include $(CONFIG)/make.config.defn diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index 9752a8a7..cedba537 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -11,10 +11,14 @@ # Dividers to make the screen output slightly nicer DIVEL = __________________ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) +ifeq ($(shell echo $(VERBOSE) | tr '[:upper:]' '[:lower:]'),yes) define NOTIFY_DIVIDER - VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ - if test "$(VERBOSE)" = "yes"; then echo $(DIVIDER); fi + echo $(DIVIDER) endef +else +define NOTIFY_DIVIDER +endef +endif # Include the main make definitions for this configuration include $(CONFIG)/make.config.defn |