gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]

7 files changed, 12 insertions, 8 deletions

diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 9213abedd3b1..2682943e7d6d 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -157,11 +157,12 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
     cppu \
     vos3 \
     sal \
-    icuuc \
     i18nisolang1 \
     i18npaper \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,editeng,icuuc)
+
 # vim: set noet sw=4 ts=4:
 
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 1181a9ae62d5..2fa36b1d5682 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -58,10 +58,11 @@ $(eval $(call gb_Library_add_linked_libs,lng,\
 	xo \
 	ucbhelper \
 	utl \
-	icuuc \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,lng,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,lng,\
 	linguistic/source/convdic \
 	linguistic/source/convdiclist \
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 2344d79746c4..2216f54d84a8 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -73,11 +73,12 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
     utl \
     vcl \
     vos3 \
-    xml2 \
     eggtray \
     sfx \
 ))
 
+$(call gb_Library_use_external,qstart_gtk,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
     sfx2/source/appl/shutdowniconunx \
 ))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index c18b46c8f16e..a41404109d97 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_set_include,sfx,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
-    $(LIBXML_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_set_defs,sfx,\
@@ -75,10 +74,11 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     utl \
     vcl \
     vos3 \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,sfx,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/appl/app \
     sfx2/source/appl/appbas \
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index b88e2581f2da..f42b8122e9ef 100755
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -52,7 +52,6 @@ endif
 endif
 
 #todo: source/dialog BUILD_VER_STRING
-#todo: source/doc SYSTEM_LIBXML2
 #todo: ENABLE_LAYOUT
 #todo: clean up quickstarter stuff in both libraries
 #todo: move standard pool to svl
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 4ce5250f77a5..db42baec6b3c 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     drawinglayer \
     editeng \
     i18nisolang1 \
-    icuuc \
     sal \
     sfx \
     sot \
@@ -71,6 +70,8 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,svx,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/accessibility/AccessibleControlShape \
     svx/source/accessibility/AccessibleEmptyEditSource \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index dd31e6b4bdd1..2437ae996c27 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     editeng \
     fwe \
     i18nisolang1 \
-    icuuc \
     lng \
     sal \
     sfx \
@@ -86,6 +85,8 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,svxcore,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/core/coreservices \
     svx/source/customshapes/EnhancedCustomShape2d \