4 files changed, 9 insertions, 25 deletions
diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk
index 7637eef13a82..7f4b7729dcb4 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,unordf_complex))
+$(eval $(call gb_JunitTest_JunitTest,unordf_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
     $$(DEFS) \
diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk
index 09eaa32e7bbe..cb6ce8521e6e 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,unoxml_complex))
+$(eval $(call gb_JunitTest_JunitTest,unoxml_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
     $$(DEFS) \
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index bc993fb022b6..f716cf2afa59 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,unordf,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,unordf,\
-    $$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_api,unordf,\
 	udkapi \
 	offapi \
@@ -46,11 +42,14 @@ $(eval $(call gb_Library_add_linked_libs,unordf,\
     cppuhelper \
     cppu \
     sal \
-    rdf \
-    xslt \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,unordf,\
+	librdf \
+	libxslt \
+)
+
 $(eval $(call gb_Library_add_exception_objects,unordf,\
     unoxml/source/rdf/CBlankNode \
     unoxml/source/rdf/CURI \
@@ -59,12 +58,7 @@ $(eval $(call gb_Library_add_exception_objects,unordf,\
     unoxml/source/rdf/librdf_services \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,unordf,\
-    $$(CXXFLAGS) \
     $$(REDLAND_CFLAGS) \
-    $$(LIBXSLT_CFLAGS) \
     $$(LIBXML_CFLAGS) \
-))
-
 # vim: set noet sw=4 ts=4:
 
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 907ee0f0fdf8..b51253a44036 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -33,15 +33,11 @@ $(eval $(call gb_Library_set_include,unoxml,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,unoxml,\
-    $$(DEFS) \
 ))
 
 $(eval $(call gb_Library_add_api,unoxml,\
 	udkapi \
 	offapi \
-))
-
 $(eval $(call gb_Library_add_linked_libs,unoxml,\
     ucbhelper \
     sax \
@@ -49,10 +45,11 @@ $(eval $(call gb_Library_add_linked_libs,unoxml,\
     cppuhelper \
     cppu \
     sal \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,unoxml,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,unoxml,\
     unoxml/source/dom/node \
     unoxml/source/dom/document \
@@ -88,12 +85,5 @@ $(eval $(call gb_Library_add_exception_objects,unoxml,\
     unoxml/source/service/services \
 ))
 
-ifeq ($(SYSTEM_LIBXML),YES)
-$(eval $(call gb_Library_set_cxxflags,unoxml,\
-    $$(CXXFLAGS) \
-    -DSYSTEM_LIBXML $$(LIBXML_CFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4: