[Libreoffice-commits] core.git: external/boost RepositoryExternal.mk ucb/Library_ucpcmis1.mk

[David Tardon]

 RepositoryExternal.mk                           |    6 ++--
 external/boost/Module_boost.mk                  |    2 -
 external/boost/StaticLibrary_boost_date_time.mk |   32 ++++++++++++++++++++++++
 external/boost/StaticLibrary_boostdatetime.mk   |   32 ------------------------
 ucb/Library_ucpcmis1.mk                         |    2 -
 5 files changed, 37 insertions(+), 37 deletions(-)

New commits:
commit 23d2e0e8ca3dd34e96f39bf74fe4705ef640330d
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Mar 8 08:35:59 2016 +0100

    follow the boost lib naming scheme for DateTime too
    
    Change-Id: Iae7967bd5f161ecbe888824a4bcb9b87ec8d947a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ca7cdf8..7a07f46 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -631,7 +631,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(2))
 
 endef
 
-define gb_LinkTarget__use_boostdatetime
+define gb_LinkTarget__use_boost_date_time
 $(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_DATE_TIME_LIB))
 
 endef
@@ -685,8 +685,8 @@ $(call gb_LinkTarget__use_boost_lib,$(1),boostthread)
 endef
 endif
 
-define gb_LinkTarget__use_boostdatetime
-$(call gb_LinkTarget__use_boost_lib,$(1),boostdatetime)
+define gb_LinkTarget__use_boost_date_time
+$(call gb_LinkTarget__use_boost_lib,$(1),boost_date_time)
 
 endef
 
diff --git a/external/boost/Module_boost.mk b/external/boost/Module_boost.mk
index ae407f5..9aea8dc 100644
--- a/external/boost/Module_boost.mk
+++ b/external/boost/Module_boost.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,boost))
 
 $(eval $(call gb_Module_add_targets,boost,\
-	StaticLibrary_boostdatetime \
+	StaticLibrary_boost_date_time \
 	StaticLibrary_boost_filesystem \
 	StaticLibrary_boost_system \
 	StaticLibrary_boost_iostreams \
diff --git a/external/boost/StaticLibrary_boostdatetime.mk b/external/boost/StaticLibrary_boost_date_time.mk
similarity index 63%
rename from external/boost/StaticLibrary_boostdatetime.mk
rename to external/boost/StaticLibrary_boost_date_time.mk
index 6d0f6de..ef97e25 100644
--- a/external/boost/StaticLibrary_boostdatetime.mk
+++ b/external/boost/StaticLibrary_boost_date_time.mk
@@ -7,22 +7,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,boostdatetime))
+$(eval $(call gb_StaticLibrary_StaticLibrary,boost_date_time))
 
-$(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost))
+$(eval $(call gb_StaticLibrary_use_unpacked,boost_date_time,boost))
 
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostdatetime))
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_date_time))
 
 # disable "auto link" "feature" on MSVC
-$(eval $(call gb_StaticLibrary_add_defs,boostdatetime,\
+$(eval $(call gb_StaticLibrary_add_defs,boost_date_time,\
 	-DBOOST_ALL_NO_LIB \
 ))
 
-$(eval $(call gb_StaticLibrary_use_external,boostdatetime,boost_headers))
+$(eval $(call gb_StaticLibrary_use_external,boost_date_time,boost_headers))
 
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_date_time,cpp))
 
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostdatetime,\
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_date_time,\
 	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/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk
index d3d3ae3..ee76827 100644
--- a/ucb/Library_ucpcmis1.mk
+++ b/ucb/Library_ucpcmis1.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\
 
 $(eval $(call gb_Library_use_externals,ucpcmis1,\
 	boost_headers \
-	boostdatetime \
+	boost_date_time \
 	cmis \
 	curl \
 	libxml2 \