external/curl/ExternalProject_curl.mk | 4 ++-- external/firebird/ExternalProject_firebird.mk | 2 +- external/glew/ExternalProject_glew.mk | 4 ++-- external/libebook/ExternalProject_libebook.mk | 2 +- external/libgltf/ExternalProject_libgltf.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/librevenge/ExternalProject_librevenge.mk | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 6bc81d4e78184cf57d6bc99f1f2dba6938b4fa85 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Aug 29 17:14:53 2014 +0200 Simplify some $ENABLE_DEBUG expressions Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index b012079..e8e1345 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && cd lib \ && $(MAKE) \ @@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug) \ CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ LIBS="-lws2_32 -lwinmm $(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \ LDFLAGS="$(patsubst ;, -L,$(ILIB))" \ diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 6e3f582..f557a361 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): --without-editline \ --disable-superserver \ --with-system-icu --without-fbsample --without-fbsample-db \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ && $(if $(filter WNT,$(OS)),\ diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index 7eec3e8..54348f5 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -24,8 +24,8 @@ else $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,glew,\ - $(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) LD="$(CC)" \ - $(MAKE) STRIP= glew.lib $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \ + $(if $(ENABLE_DEBUG),STRIP=) LD="$(CC)" \ + $(MAKE) STRIP= glew.lib $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(ENABLE_DEBUG),debug)) \ ) endif diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 293028f..ca1c7e4 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : --without-docs \ --without-tools \ --disable-tests \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk index c402e59..0976f42 100644 --- a/external/libgltf/ExternalProject_libgltf.mk +++ b/external/libgltf/ExternalProject_libgltf.mk @@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) : --disable-shared \ --enable-static \ --with-pic \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) -I$(BUILDDIR)/config_$(gb_Side)" \ GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include)" \ diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index 5805f58..f33b463 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --disable-shared \ --without-docs \ --disable-tools \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ --disable-weffc \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index 5a19d85..88d437b 100644 --- a/external/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : --without-docs \ --disable-tools \ --disable-zip \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \ diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index c86fdc3..1a0a042 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : , \ --enable-shared --disable-static \ ) \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ --disable-weffc \ --without-docs \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index fd99956..8dfcfd5 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -96,7 +96,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --with-pic \ --enable-static \ --disable-shared \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-spreadsheet-model \ --without-tools \ --disable-werror \ diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk index 7fcdc3e..e6893c7 100644 --- a/external/librevenge/ExternalProject_librevenge.mk +++ b/external/librevenge/ExternalProject_librevenge.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) : --with-pic \ --enable-shared \ --disable-static \ - $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ --disable-weffc \ --disable-streams \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits