Control verbose flag passed to jlibtool

diff --git a/Make.inc.in b/Make.inc.in
index dc3f7040bd40b7c0b65df63ba74405b33e9f8993..0d415e5087272b58c6c7595c140290e4b43b94e7 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -181,7 +181,7 @@ ANALYZE.c       := @clang_path@
 #  Have wrappers for the test tools, so that they run.
 #
 TEST_BIN_DIR = ./$(BUILD_DIR)/bin/local
-TEST_BIN    =  $(JLIBTOOL) --quiet --mode=execute $(TEST_BIN_DIR)
+TEST_BIN    =  $(JLIBTOOL) $(if ${VERBOSE},--debug,--silent) --mode=execute $(TEST_BIN_DIR)
 
 #
 #  For creating documentation via doc/all.mk

diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index 7b1907ad43ac97fcd7971b6836400fb664d7fd24..acfc01d317e343537cb88b129b5ea0301ccf1f4e 100644 (file)
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -70,12 +70,13 @@ clean.libs:
 
 # Re-define compilers and linkers
 #
+LIBTOOL_VERBOSE=$(if ${VERBOSE},--debug,--silent)
 OBJ_EXT = lo
-COMPILE.c = ${LIBTOOL} --silent --mode=compile ${CC}
-COMPILE.cxx = ${LIBTOOL} --mode=compile ${CXX}
-LINK.c = ${LIBTOOL} --silent --mode=link ${CC}
-LINK.cxx = ${LIBTOOL} --mode=link ${CXX}
-PROGRAM_INSTALL = ${LIBTOOL} --silent --mode=install ${INSTALL}
+COMPILE.c = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=compile ${CC}
+COMPILE.cxx = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=compile ${CXX}
+LINK.c = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=link ${CC}
+LINK.cxx = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=link ${CXX}
+PROGRAM_INSTALL = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=install ${INSTALL}
 
 
 # LIBTOOL_ENDINGS - Given a library ending in ".a" or ".so", replace that

diff --git a/src/tests/radiusd.mk b/src/tests/radiusd.mk
index ce9eb671b58993e9c986e40c2d41feb03ee5a625..000a42f6b514b523d517adcc46dc3481d72905a0 100644 (file)
--- a/src/tests/radiusd.mk
+++ b/src/tests/radiusd.mk
@@ -46,7 +46,7 @@
 include Make.inc
 
 define RADIUSD_SERVICE
-$$(eval RADIUSD_BIN := $(JLIBTOOL) --silent --mode=execute $$(TEST_BIN)/radiusd)
+$$(eval RADIUSD_BIN := $(JLIBTOOL) $(if ${VERBOSE},--debug,--silent) --mode=execute $$(TEST_BIN)/radiusd)
 $(eval PORT := $(shell echo $$(($(PORT)+1))))
 $(eval $(subst test.,,$(TEST))_port := $(PORT))