diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-24 14:46:28 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-24 14:46:28 +0200 |
| commit | cdabc886f68c0a8e510c7795dcab9c192cb6b5c8 (patch) | |
| tree | e6f888434c6a2c09ebc29c650e599ae74fcdb6ff /boost | |
| parent | 3aeecc525c76797801e9e2b24c2ebff6ac81adac (diff) | |
Revert "Rename Boost libraries when built internally to match conventions"
This reverts commit 3aeecc525c76797801e9e2b24c2ebff6ac81adac.
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/Module_boost.mk | 4 | ||||
| -rw-r--r-- | boost/StaticLibrary_boostdatetime.mk (renamed from boost/StaticLibrary_boost_date_time.mk) | 12 | ||||
| -rw-r--r-- | boost/StaticLibrary_boostsystem.mk (renamed from boost/StaticLibrary_boost_system.mk) | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk index b4b3aa1783cc..9274e4ad52b4 100644 --- a/boost/Module_boost.mk +++ b/boost/Module_boost.mk @@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,boost)) ifeq ($(SYSTEM_BOOST),NO) $(eval $(call gb_Module_add_targets,boost,\ - StaticLibrary_boost_date_time \ - StaticLibrary_boost_system \ + StaticLibrary_boostdatetime \ + StaticLibrary_boostsystem \ UnpackedTarball_boost \ )) diff --git a/boost/StaticLibrary_boost_date_time.mk b/boost/StaticLibrary_boostdatetime.mk index fb189463f0c1..bea82da1cf31 100644 --- a/boost/StaticLibrary_boost_date_time.mk +++ b/boost/StaticLibrary_boostdatetime.mk @@ -7,20 +7,20 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_StaticLibrary_StaticLibrary,boost_date_time)) +$(eval $(call gb_StaticLibrary_StaticLibrary,boostdatetime)) -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_date_time)) +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostdatetime)) # disable "auto link" "feature" on MSVC -$(eval $(call gb_StaticLibrary_add_defs,boost_date_time,\ +$(eval $(call gb_StaticLibrary_add_defs,boostdatetime,\ -DBOOST_ALL_NO_LIB \ )) -$(eval $(call gb_StaticLibrary_use_external,boost_date_time,boost_headers)) +$(eval $(call gb_StaticLibrary_use_external,boostdatetime,boost_headers)) -$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_date_time,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp)) -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_date_time,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostdatetime,\ UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \ UnpackedTarball/boost/libs/date_time/src/gregorian/gregorian_types \ UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month \ diff --git a/boost/StaticLibrary_boost_system.mk b/boost/StaticLibrary_boostsystem.mk index 1a950d72b3a3..053321b3f02f 100644 --- a/boost/StaticLibrary_boost_system.mk +++ b/boost/StaticLibrary_boostsystem.mk @@ -7,20 +7,20 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_StaticLibrary_StaticLibrary,boost_system)) +$(eval $(call gb_StaticLibrary_StaticLibrary,boostsystem)) -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_system)) +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostsystem)) # disable "auto link" "feature" on MSVC -$(eval $(call gb_StaticLibrary_add_defs,boost_system,\ +$(eval $(call gb_StaticLibrary_add_defs,boostsystem,\ -DBOOST_ALL_NO_LIB \ )) -$(eval $(call gb_StaticLibrary_use_external,boost_system,boost_headers)) +$(eval $(call gb_StaticLibrary_use_external,boostsystem,boost_headers)) -$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_system,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostsystem,cpp)) -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_system,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostsystem,\ UnpackedTarball/boost/libs/system/src/error_code \ )) |