From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 26 Jan 2012 09:01:05 +0000 (+0100)
Subject: Made ECHO a macro
X-Git-Tag: release_3_0_0_beta0~369
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=429cf23fa3a41a828c02f8203f4345da6ad9c0aa

Made ECHO a macro

so that doing "ECHO=true" means the ONLY output becomes errors
from the compiler.
---

diff --git a/scripts/boiler.mk b/scripts/boiler.mk
index e6100a9..521a975 100644
--- a/scripts/boiler.mk
+++ b/scripts/boiler.mk
@@ -177,7 +177,7 @@ define ADD_TARGET_RULE.exe
     # Create executable ${1}
     $${${1}_BUILD}/${1}: $${${1}_OBJS} $${${1}_PRBIN} $${${1}_PRLIBS}
 	    @$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))
-	    @echo LINK $${${1}_BUILD}/${1}
+	    @$(ECHO) LINK $${${1}_BUILD}/${1}
 	    @$${${1}_LINKER} -o $${${1}_BUILD}/${1} $${RPATH_FLAGS} $${LDFLAGS} \
                 $${${1}_LDFLAGS} $${${1}_OBJS} $${${1}_PRLIBS} \
                 $${LDLIBS} $${${1}_LDLIBS}
@@ -197,7 +197,7 @@ define ADD_TARGET_RULE.a
     # Create static library ${1}
     $${${1}_BUILD}/${1}: $${${1}_OBJS} $${${1}_PREREQS}
 	    @$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))
-	    @echo LINK $${${1}_BUILD}/${1}
+	    @$(ECHO) LINK $${${1}_BUILD}/${1}
 	    @$${AR} $${ARFLAGS} $${${1}_BUILD}/${1} $${${1}_OBJS}
 	    @$${${1}_POSTMAKE}
 
@@ -240,7 +240,7 @@ endef
 # COMPILE_C_CMDS - Commands for compiling C source code.
 define COMPILE_C_CMDS
 	@mkdir -p $(dir $@)
-	@echo CC $<
+	@$(ECHO) CC $<
 	@$(strip ${COMPILE.c} -o $@ -c -MD ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \
 	    ${SRC_INCDIRS} ${SRC_DEFS} ${DEFS} $<)
 endef
@@ -524,6 +524,9 @@ CPP = cc -E
 LINK.c = ${CC}
 LINK.cxx = ${CXX}
 
+# Set ECHO to "true" for *very* quiet builds
+ECHO = echo
+
 # Define the "all" target (which simply builds all user-defined targets) as the
 # default goal.
 .PHONY: all
diff --git a/scripts/install.mk b/scripts/install.mk
index c659c0a..900cea4 100644
--- a/scripts/install.mk
+++ b/scripts/install.mk
@@ -36,7 +36,7 @@ define ADD_INSTALL_RULE.exe
 
     # Install executable ${1}
     $${${1}_INSTALLDIR}/$(notdir ${1}): $${${1}_BUILD}/$${RELINK}${1}
-	@echo INSTALL ${1}
+	@$(ECHO) INSTALL ${1}
 	@$${PROGRAM_INSTALL} -d -m 755 $${${1}_INSTALLDIR}
 	@$${PROGRAM_INSTALL} -c -m 755 $${BUILD_DIR}/bin/$${RELINK}${1} $${${1}_INSTALLDIR}/
 	@$${${1}_POSTINSTALL}
@@ -56,7 +56,7 @@ define ADD_INSTALL_RULE.a
 
     # Install static library ${1}
     $${${1}_INSTALLDIR}/$(notdir ${1}): ${1}
-	@echo INSTALL ${1}
+	@$(ECHO) INSTALL ${1}
 	@$${PROGRAM_INSTALL} -d -m 755 $${${1}_INSTALLDIR}
 	@$${PROGRAM_INSTALL} -c -m 755 $${BUILD_DIR}/lib/${1} $${${1}_INSTALLDIR}/
 	@$${${1}_POSTINSTALL}
@@ -79,7 +79,7 @@ define ADD_INSTALL_RULE.la
 
     # Install libtool library ${1}
     $${${1}_INSTALLDIR}/$(notdir ${1}): $${${1}_BUILD}/$${RELINK}${1}
-	@echo INSTALL ${1}
+	@$(ECHO) INSTALL ${1}
 	@$${PROGRAM_INSTALL} -d -m 755 $${${1}_INSTALLDIR}
 	@$${PROGRAM_INSTALL} -c -m 755 $${BUILD_DIR}/lib/$${RELINK}${1} $${${1}_INSTALLDIR}/
 	@$${${1}_POSTINSTALL}
@@ -100,7 +100,7 @@ define ADD_INSTALL_RULE.man
 
     # Install manual page ${1}
     ${2}/$(notdir ${1}): ${1} ${2}
-	@echo INSTALL ${1}
+	@$(ECHO) INSTALL ${1}
 	@$${PROGRAM_INSTALL} -c -m 644 ${1} ${2}/
 
 endef
@@ -223,6 +223,6 @@ install: install_ERROR
 
 .PHONY: install_ERROR
 install_ERROR:
-	@echo Please define INSTALL in order to enable the installation rules.
+	@$(ECHO) Please define INSTALL in order to enable the installation rules.
 	@exit 1
 endif
diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index c58569a..4238325 100644
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -83,7 +83,7 @@ define ADD_TARGET_RULE.la
     # Create libtool library ${1}
     $${${1}_BUILD}/${1}: $${${1}_OBJS} $${${1}_PREREQS}
 	    @$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))
-	    @echo LINK $${${1}_BUILD}/${1}
+	    @$(ECHO) LINK $${${1}_BUILD}/${1}
 	    @$${${1}_LINKER} -o $${${1}_BUILD}/${1} $${RPATH_FLAGS} $${LDFLAGS} \
                 $${${1}_LDFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS}
 	    @$${${1}_POSTMAKE}