diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-24 15:00:14 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 15:03:45 +0300 |
| commit | 3aeecc525c76797801e9e2b24c2ebff6ac81adac (patch) | |
| tree | 9149a2f91b918f77083fdee21e42e9bc0c80c85d /RepositoryExternal.mk | |
| parent | 58b9060b5f325f611dd7d5748dfa41b897aa09eb (diff) | |
Rename Boost libraries when built internally to match conventions
The standard Boost convention is for them to be called libboost_date_time and
libboost_system (with apropriate suffix then depending on type).
Did not touch the libboostthread library we build for Windows.
Add the ax_boost_thread.m4 file for completeness and possible use.
Document where the ax_boost*.m4 files come from.
Change-Id: Ib49bee71398d62c9760a1f8fd5c46be9f3400430
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0be205470fea..c3b0d66da38c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -540,7 +540,7 @@ endif # SYSTEM_HUNSPELL ifeq ($(SYSTEM_BOOST),YES) -define gb_LinkTarget__use_boostdatetime +define gb_LinkTarget__use_boost_date_time $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(BOOST_CPPFLAGS) \ @@ -556,7 +556,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -define gb_LinkTarget__use_boostsystem +define gb_LinkTarget__use_boost_system $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(BOOST_CPPFLAGS) \ @@ -572,7 +572,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -gb_ExternalProject__use_boostsystem := +gb_ExternalProject__use_boost_system := define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_set_include,$(1),\ @@ -587,8 +587,8 @@ gb_ExternalProject__use_boost_headers:= else # !SYSTEM_BOOST $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - boostdatetime \ - boostsystem \ + boost_date_time \ + boost_system \ )) ifeq ($(OS),WNT) @@ -608,30 +608,30 @@ endef endif # WNT -define gb_LinkTarget__use_boostdatetime +define gb_LinkTarget__use_boost_date_time $(call gb_LinkTarget_add_defs,$(1),\ -DBOOST_ALL_NO_LIB \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - boostdatetime \ + boost_date_time \ ) endef -define gb_LinkTarget__use_boostsystem +define gb_LinkTarget__use_boost_system $(call gb_LinkTarget_add_defs,$(1),\ -DBOOST_ALL_NO_LIB \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - boostsystem \ + boost_system \ ) endef -define gb_ExternalProject__use_boostsystem -$(call gb_LinkTarget_use_static_libraries,$(1),boostsystem) +define gb_ExternalProject__use_boost_system +$(call gb_LinkTarget_use_static_libraries,$(1),boost_system) endef define gb_LinkTarget__use_boost_headers |