From 4d427bd5c8fe9b3488bd3da49e4158c3021deab0 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Mon, 30 May 2011 18:16:33 +0200
Subject: ause130: #i117218# missing pieces...

---
 unoxml/Library_unordf.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'unoxml/Library_unordf.mk')

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 2ca96df4030c..7990c69f3047 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -31,13 +31,17 @@ $(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf))
 
 $(eval $(call gb_Library_set_include,unordf,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,unordf,\
     $$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,unordf,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,unordf,\
     cppuhelper \
     cppu \
-- 
cgit 


From e556a28fec98abfe404c753f6874d1b0c50f2c52 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 15 Jul 2011 14:00:53 +0300
Subject: Just use REDLAND_CFLAGS, LIBXSLT_CFLAGS and LIBXML_CFLAGS always

They are empty anyway when not needed, I think.
---
 unoxml/Library_unordf.mk | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'unoxml/Library_unordf.mk')

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 7990c69f3047..bc993fb022b6 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -59,19 +59,12 @@ $(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) \
+    $$(REDLAND_CFLAGS) \
     $$(LIBXSLT_CFLAGS) \
+    $$(LIBXML_CFLAGS) \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
 
-- 
cgit