diff options
| -rw-r--r-- | unoxml/Library_unordf.mk | 21 | ||||
| -rw-r--r-- | unoxml/Library_unoxml.mk | 10 |
2 files changed, 7 insertions, 24 deletions
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index 79123c6a359c..4a2ef0f20349 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -43,11 +43,14 @@ $(eval $(call gb_Library_add_linked_libs,unordf,\ cppu \ sal \ stl \ - 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 \ @@ -56,19 +59,5 @@ $(eval $(call gb_Library_add_exception_objects,unordf,\ unoxml/source/rdf/librdf_services \ )) -ifeq ($(SYSTEM_REDLAND),YES) -$(eval $(call gb_Library_set_cxxflags,unordf,\ - $$(CXXFLAGS) \ - -DSYSTEM_REDLAND $$(REDLAND_CFLAGS) \ -)) -endif - -ifeq ($(SYSTEM_LIBXSLT),YES) -$(eval $(call gb_Library_set_cxxflags,unordf,\ - $$(CXXFLAGS) \ - $$(LIBXSLT_CFLAGS) \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 517c8a8462c0..d88296e6799f 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -46,10 +46,11 @@ $(eval $(call gb_Library_add_linked_libs,unoxml,\ cppu \ sal \ stl \ - 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 \ @@ -85,12 +86,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: |