diff options
| author | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-09-28 03:15:23 +0000 |
|---|---|---|
| committer | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-09-28 03:15:23 +0000 |
| commit | 643410515c22de2945df896974b44c9ca2c6051e (patch) | |
| tree | 83ab57619ddd8d6e3c8b80a18cd32114f89a65ee /lib/make | |
| parent | 247c55146bdc71db2f3b5b3944a9fcc9914ba467 (diff) | |
fix issue #586: bashisms, and uppercase VERBOSE=YES, as well as a couple of minor cosmetics issues
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4739 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
| -rw-r--r-- | lib/make/make.config.rules.in | 5 | ||||
| -rw-r--r-- | lib/make/make.configuration | 4 | ||||
| -rw-r--r-- | lib/make/make.subdir | 3 | ||||
| -rw-r--r-- | lib/make/make.thornlib | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index bddad398..e6b7637d 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -30,19 +30,24 @@ INCLUDE_LINE = $(patsubst %,-I"%",$(call TRANSFORM_DIRS,$(INC_DIRS))) ##################################################################### define NOTIFY_PREPROCESSING + VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ if test "$(VERBOSE)" = "yes"; then echo Preprocessing $<; fi endef define NOTIFY_COPYING + VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ if test "$(VERBOSE)" = "yes"; then echo Copying $<; fi endef define NOTIFY_COMPILING + VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ if test "$(VERBOSE)" = "yes"; then echo Compiling $<; \ else echo COMPILING $<; fi endef define NOTIFY_POSTPROCESSING + VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ if test "$(VERBOSE)" = "yes"; then echo Postprocessing $<; fi endef define NOTIFY_DIVIDER + VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ if test "$(VERBOSE)" = "yes"; then echo $(DIVIDER); fi endef diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 8d74235d..87660cec 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -8,9 +8,6 @@ # @version $Id$ # @@*/ -# Silence all but designated output -#.VERBOSE: - # Some configuration variables CONFIG = $(TOP)/config-data BINDINGS_DIR = $(TOP)/bindings @@ -49,6 +46,7 @@ CACTUSLIBS = $(FLESHLIB) $(BINDINGSLIB) DIVEL = __________________ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) define NOTIFY_DIVIDER + VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ if test "$(VERBOSE)" = "yes"; then echo $(DIVIDER); fi endef diff --git a/lib/make/make.subdir b/lib/make/make.subdir index 676dbdc1..8fc8bff6 100644 --- a/lib/make/make.subdir +++ b/lib/make/make.subdir @@ -8,9 +8,6 @@ # @version $Id$ # @@*/ -# Silence all but designated output -#.VERBOSE: - # Include the main make definitions for this configuration include $(CONFIG)/make.config.defn diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index 49861b0e..9752a8a7 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -8,13 +8,11 @@ # @version $Id$ # @@*/ -# Silence all but designated output -#.VERBOSE: - # Dividers to make the screen output slightly nicer DIVEL = __________________ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) define NOTIFY_DIVIDER + VERBOSE=`echo $VERBOSE | tr '[:upper:]' '[:lower:]'`; \ if test "$(VERBOSE)" = "yes"; then echo $(DIVIDER); fi endef |