From a8db357874b3ab3f785457cd9a84c68a05d3c61e Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 10 Aug 2015 14:06:40 -0500 Subject: gbuild/config stop using VERBOSE, use only verbose=t configure.ac was setting VERBOSE=YES/NO when really we use verbose=t or verbose= Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299 Reviewed-on: https://gerrit.libreoffice.org/17634 Tested-by: Jenkins Reviewed-by: Norbert Thiebaud --- external/harfbuzz/ExternalProject_harfbuzz.mk | 2 +- external/libabw/ExternalProject_libabw.mk | 2 +- external/libcdr/ExternalProject_libcdr.mk | 2 +- external/libebook/ExternalProject_libebook.mk | 2 +- external/libeot/ExternalProject_libeot.mk | 2 +- external/libetonyek/ExternalProject_libetonyek.mk | 2 +- external/libfreehand/ExternalProject_libfreehand.mk | 2 +- external/liblangtag/ExternalProject_langtag.mk | 2 +- external/libmspub/ExternalProject_libmspub.mk | 2 +- external/libmwaw/ExternalProject_libmwaw.mk | 2 +- external/libodfgen/ExternalProject_libodfgen.mk | 2 +- external/liborcus/ExternalProject_liborcus.mk | 2 +- external/libpagemaker/ExternalProject_libpagemaker.mk | 2 +- external/librevenge/ExternalProject_librevenge.mk | 2 +- external/libvisio/ExternalProject_libvisio.mk | 2 +- external/libwpd/ExternalProject_libwpd.mk | 2 +- external/libwpg/ExternalProject_libwpg.mk | 2 +- external/libwps/ExternalProject_libwps.mk | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) (limited to 'external') diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index 302eed71e698..52db53366dc1 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : --with-freetype=no \ --with-cairo=no \ --with-glib=no \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \ ) diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index fd0b98ae5ac5..9a07409688d9 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) : --disable-tools \ --disable-debug \ --disable-werror \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ -I$(call gb_UnpackedTarball_get_dir,boost))" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index fd9658d0997c..e4d7c9b7ed24 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --disable-debug \ --disable-werror \ --disable-weffc \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 5e7f2b010537..29c9b55a2679 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : --without-tools \ --disable-tests \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk index dc6a987ae99a..e40186e9e849 100644 --- a/external/libeot/ExternalProject_libeot.mk +++ b/external/libeot/ExternalProject_libeot.mk @@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,libeot,build) : --disable-shared \ --disable-debug \ CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \ - && $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \ + && $(MAKE) $(if $(verbose),V=1) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 19be03321aeb..2f128d6e3ac7 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : --disable-weffc \ --without-tools \ $(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(filter LINUX,$(OS)), \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 4cc232fb77b8..15a17072e872 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) : --disable-debug \ --disable-werror \ --disable-weffc \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index c6b195d3c0a6..723d8329fe5a 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build): && $(if $(filter WNTMSC,$(OS)$(COM)),\ REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \ REAL_CC_FLAGS="$(filter -%,$(CC))") \ - $(if $(VERBOSE)$(verbose),V=1) \ + $(if $(verbose),V=1) \ $(gb_Helper_set_ld_path) \ $(MAKE) \ ) diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index 644fc4231302..b45707d1515c 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ --disable-weffc \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index d1f05d328afd..5dbb7723508d 100644 --- a/external/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : --disable-tools \ --disable-zip \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ $(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \ diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index 2ad5a155b064..b60d40662218 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-werror \ --disable-weffc \ --without-docs \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 2975aeb84c1f..cc758103d5eb 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -107,7 +107,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : boost_cv_lib_system=yes \ ) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(if $(VERBOSE)$(verbose),V=1) \ + && $(if $(verbose),V=1) \ $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk index f892d42a1162..ab76136dd152 100644 --- a/external/libpagemaker/ExternalProject_libpagemaker.mk +++ b/external/libpagemaker/ExternalProject_libpagemaker.mk @@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) : --disable-debug \ --disable-werror \ --disable-weffc \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk index 861a47cf4436..e023237aa087 100644 --- a/external/librevenge/ExternalProject_librevenge.mk +++ b/external/librevenge/ExternalProject_librevenge.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) : --disable-streams \ --disable-generators \ --without-docs \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index db65a450ffb7..b7147885bb22 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : --disable-tools \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index 286e502c7d3d..feee6e0270d3 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : $(if $(filter MACOSX,$(OS)), \ --disable-werror \ --prefix=/@.__________________________________________________OOO) \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index e65e2acc4c5d..e05a5261d67d 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : --disable-debug \ --disable-werror \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter LINUX,$(OS)), \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk index 10b39b3750a4..475f56a42d64 100644 --- a/external/libwps/ExternalProject_libwps.mk +++ b/external/libwps/ExternalProject_libwps.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : --disable-tools \ --disable-debug \ --disable-werror \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -- cgit