[Libreoffice-commits] core.git: 2 commits - Repository.mk svx/Library_svxcore.mk sw/Library_sw.mk

[Matúš Kukan]

 Repository.mk          |   29 ++++-------------------------
 svx/Library_svxcore.mk |    1 -
 sw/Library_sw.mk       |    1 -
 3 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit 4daf6600a3f5c1d58ff1c79396f05d3ea5cb7103
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Apr 15 23:41:45 2015 +0200

    Move these together
    
    Change-Id: I0352e3180d553c46c6ca905628d5b46d1af0b8a7

diff --git a/Repository.mk b/Repository.mk
index 0928df6..f9a5208 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -186,26 +186,6 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
 ))
 
-ifneq (,$(filter ANDROID IOS,$(OS)))
-
-# these are in NONE layer because
-# a) scp2 is not used on mobile b) layers don't mean anything on mobile
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-	$(if $(filter $(OS),ANDROID), \
-		lo-bootstrap \
-	) \
-))
-
-endif
-
-ifeq ($(OS),MACOSX)
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-	OOoSpotlightImporter \
-))
-
-endif
-
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
 	abp \
 	dbp \
@@ -519,6 +499,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
 	writerfilter \
 ))
 
+# cli_cppuhelper is NONE even though it is actually in URE because it is CliNativeLibrary
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 	getuid \
 	smoketest \
@@ -533,6 +514,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 	vclbootstrapprotector \
 	scqahelper \
 	unowinreg \
+	$(if $(filter MSC,$(COM)),cli_cppuhelper) \
+	$(if $(filter $(OS),ANDROID),lo-bootstrap) \
+	$(if $(filter $(OS),MACOSX),OOoSpotlightImporter) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
@@ -576,11 +560,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
 	xmlreader \
 ))
 
-# this is NONE even though it is actually in URE because it is CliNativeLibrary
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-	$(if $(filter MSC,$(COM)),cli_cppuhelper) \
-))
-
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	$(if $(ENABLE_VLC),avmediavlc) \
 	$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
commit fa3daee4b694202009f3d98c7b374825ec34605d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Apr 15 20:02:25 2015 +0200

    DBTOOLS_DLL_NAME not used anymore
    
    Change-Id: Ieb9a373e4d59bfe72a7709bd7822617f9877054a

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 1c619c6..ce93cc8 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
 $(eval $(call gb_Library_add_defs,svxcore,\
     -DSVX_DLLIMPLEMENTATION \
     -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-    -DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 673585a..a6f7a3a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 $(eval $(call gb_Library_add_defs,sw,\
     -DSW_DLLIMPLEMENTATION \
 	-DSWUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,swui))\" \
-	-DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\