Simplify some $ENABLE_DEBUG expressions
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
This commit is contained in:
parent
5990beed9a
commit
6bc81d4e78
10 changed files with 12 additions and 12 deletions
4
external/curl/ExternalProject_curl.mk
vendored
4
external/curl/ExternalProject_curl.mk
vendored
|
@ -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))" \
|
||||
|
|
|
@ -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)),\
|
||||
|
|
4
external/glew/ExternalProject_glew.mk
vendored
4
external/glew/ExternalProject_glew.mk
vendored
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
2
external/libgltf/ExternalProject_libgltf.mk
vendored
2
external/libgltf/ExternalProject_libgltf.mk
vendored
|
@ -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)" \
|
||||
|
|
|
@ -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) \
|
||||
|
|
2
external/libmwaw/ExternalProject_libmwaw.mk
vendored
2
external/libmwaw/ExternalProject_libmwaw.mk
vendored
|
@ -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))" \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue