[Libreoffice-commits] .: unoxml/Library_unordf.mk

Tor Lillqvist tml at kemper.freedesktop.org
Thu Jul 21 04:30:35 PDT 2011


 unoxml/Library_unordf.mk |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 5db719abaa5d6be05c86f1f438ae82e9c0ee8070
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jul 15 14:00:53 2011 +0300

    Just use REDLAND_CFLAGS, LIBXSLT_CFLAGS and LIBXML_CFLAGS always
    
    They are empty anyway when not needed, I think.

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 7990c69..bc993fb 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:
 


More information about the Libreoffice-commits mailing list