mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce copypasta

Browse Source 
Change-Id: I5303caf69128a0a6d28fccfcf2ab63ed466e3853
This commit is contained in:
David Tardon
2016-03-08 06:06:36 +01:00
parent d72a33c6ae
commit 57c439a15e
1 changed files with 22 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
RepositoryExternal.mk
View File

@@ -617,7 +617,7 @@ endif # SYSTEM_HUNSPELL
ifneq ($(SYSTEM_BOOST),) ifneq ($(SYSTEM_BOOST),)
define gb_LinkTarget__use_boostdatetime define gb_LinkTarget__use_boost_lib
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
@@ -627,43 +627,24 @@ $(call gb_LinkTarget_add_ldflags,$(1),\
$(BOOST_LDFLAGS) \ $(BOOST_LDFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),$(2))
$(BOOST_DATE_TIME_LIB) \
) endef
define gb_LinkTarget__use_boostdatetime
$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_DATE_TIME_LIB))
endef endef
define gb_LinkTarget__use_boost_iostreams define gb_LinkTarget__use_boost_iostreams
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_IOSTREAMS_LIB))
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
)
$(call gb_LinkTarget_add_ldflags,$(1),\
$(BOOST_LDFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(BOOST_IOSTREAMS_LIB) \
)
endef endef
gb_ExternalProject__use_boost_iostreams := gb_ExternalProject__use_boost_iostreams :=
define gb_LinkTarget__use_boost_system define gb_LinkTarget__use_boost_system
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_SYSTEM_LIB))
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
)
$(call gb_LinkTarget_add_ldflags,$(1),\
$(BOOST_LDFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(BOOST_SYSTEM_LIB) \
)
endef endef
@@ -681,37 +662,29 @@ gb_ExternalProject__use_boost_headers:=
else # !SYSTEM_BOOST else # !SYSTEM_BOOST
ifeq ($(OS),WNT) define gb_LinkTarget__use_boost_lib
define gb_LinkTarget__use_boostthread
$(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget_add_defs,$(1),\
-DBOOST_ALL_NO_LIB \ -DBOOST_ALL_NO_LIB \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),$(2))
boostthread \
) endef
ifeq ($(OS),WNT)
define gb_LinkTarget__use_boostthread
$(call gb_LinkTarget__use_boost_lib,$(1),boostthread)
endef endef
endif endif
define gb_LinkTarget__use_boostdatetime define gb_LinkTarget__use_boostdatetime
$(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget__use_boost_lib,$(1),boostdatetime)
-DBOOST_ALL_NO_LIB \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
boostdatetime \
)
endef endef
define gb_LinkTarget__use_boost_filesystem define gb_LinkTarget__use_boost_filesystem
$(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget__use_boost_lib,$(1),boost_filesystem)
-DBOOST_ALL_NO_LIB \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
boost_filesystem \
)
endef endef
@@ -720,13 +693,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
endef endef
define gb_LinkTarget__use_boost_iostreams define gb_LinkTarget__use_boost_iostreams
$(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget__use_boost_lib,$(1),boost_iostreams)
-DBOOST_ALL_NO_LIB \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
boost_iostreams \
)
endef endef
@@ -735,13 +702,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams)
endef endef
define gb_LinkTarget__use_boost_system define gb_LinkTarget__use_boost_system
$(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget__use_boost_lib,$(1),boost_system)
-DBOOST_ALL_NO_LIB \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
boost_system \
)
endef endef