epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

configure: Replace COMMENT with NOP in ECHO

Browse Source 
Using COMMENT the ECHO command drops the whole line under -s,
whereas using NOP (':') only drops up to the next ';' terminator.
This commit is contained in:
Andrew Johnson
2012-05-01 10:15:45 -05:00
parent dde8c61ad8
commit 45348ad6ca
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/CONFIG_COMMON
View File

@@ -81,8 +81,8 @@ COMMON_DIR = ../O.Common
#------------------------------------------------------- #-------------------------------------------------------
# Make echo output - suppress echoing if make's '-s' flag is set # Make echo output - suppress echoing if make's '-s' flag is set
COMMENT = \# NOP = :
ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(COMMENT),echo) ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
#------------------------------------------------------- #-------------------------------------------------------
ifdef T_A ifdef T_A

1
configure/RULES.Db
View File

@@ -121,7 +121,6 @@ MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl
ifndef T_A ifndef T_A
ECHO := $(if $(findstring s,$(MAKEFLAGS)),$(COMMENT),@echo)
COMMON_DIR = . COMMON_DIR = .
INSTALL_DBDS = INSTALL_DBDS =
INSTALL_DBS = INSTALL_DBS =

2
configure/os/CONFIG.win32-x86-borland.Common
View File

@@ -12,7 +12,7 @@ MV = $(PERL) -MExtUtils::Command -e mv
RM = $(PERL) -MExtUtils::Command -e rm_f RM = $(PERL) -MExtUtils::Command -e rm_f
MKDIR = $(PERL) -MExtUtils::Command -e mkpath MKDIR = $(PERL) -MExtUtils::Command -e mkpath
RMDIR = $(PERL) -MExtUtils::Command -e rm_rf RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
COMMENT = $(PERL) -e '' NOP = $(PERL) -e ''
WIND_HOST_TYPE = x86-win32 WIND_HOST_TYPE = x86-win32
OSITHREAD_USE_DEFAULT_STACK = NO OSITHREAD_USE_DEFAULT_STACK = NO

2
configure/os/CONFIG.win32-x86-mingw.Common
View File

@@ -15,7 +15,7 @@ MV = $(PERL) -MExtUtils::Command -e mv
RM = $(PERL) -MExtUtils::Command -e rm_f RM = $(PERL) -MExtUtils::Command -e rm_f
MKDIR = $(PERL) -MExtUtils::Command -e mkpath MKDIR = $(PERL) -MExtUtils::Command -e mkpath
RMDIR = $(PERL) -MExtUtils::Command -e rm_rf RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
COMMENT = $(PERL) -e '' NOP = $(PERL) -e ''
WIND_HOST_TYPE = x86-win32 WIND_HOST_TYPE = x86-win32
OSITHREAD_USE_DEFAULT_STACK = NO OSITHREAD_USE_DEFAULT_STACK = NO

2
configure/os/CONFIG.win32-x86.Common
View File

@@ -12,7 +12,7 @@ MV = $(PERL) -MExtUtils::Command -e mv
RM = $(PERL) -MExtUtils::Command -e rm_f RM = $(PERL) -MExtUtils::Command -e rm_f
MKDIR = $(PERL) -MExtUtils::Command -e mkpath MKDIR = $(PERL) -MExtUtils::Command -e mkpath
RMDIR = $(PERL) -MExtUtils::Command -e rm_rf RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
COMMENT = $(PERL) -e '' NOP = $(PERL) -e ''
WIND_HOST_TYPE = x86-win32 WIND_HOST_TYPE = x86-win32
OSITHREAD_USE_DEFAULT_STACK = NO OSITHREAD_USE_DEFAULT_STACK = NO