summaryrefslogtreecommitdiff
path: root/unoxml
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2011-04-01 20:49:35 +0000
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 09:55:38 +0200
commit126d9138996b649bd7f5e86248713296492e03c9 (patch)
tree6e5d2142a87cd26ad0aa29ba80b2cb4607ea6f90 /unoxml
parentca007cc1051d7792cae9460c24565ae2e1db3b1d (diff)
gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]
Diffstat (limited to 'unoxml')
-rw-r--r--unoxml/Library_unordf.mk21
-rw-r--r--unoxml/Library_unoxml.mk10
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: