[Libreoffice-commits] .: Branch 'feature/gnumake4' - unoxml/Library_unordf.mk unoxml/Library_unoxml.mk writerfilter/Library_writerfilter.mk writerfilter/Module_writerfilter.mk

[Bjoern Michaelsen]

 unoxml/Library_unordf.mk             |    2 --
 unoxml/Library_unoxml.mk             |    4 ++--
 writerfilter/Library_writerfilter.mk |    2 --
 writerfilter/Module_writerfilter.mk  |    1 -
 4 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 9a2ba43e78b8587820f53146ed12ab5660f6451d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 21:22:43 2011 +0200

    postmerge fixes for gnumake4

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index f716cf2..2f709ff 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -58,7 +58,5 @@ $(eval $(call gb_Library_add_exception_objects,unordf,\
     unoxml/source/rdf/librdf_services \
 ))
 
-    $$(REDLAND_CFLAGS) \
-    $$(LIBXML_CFLAGS) \
 # vim: set noet sw=4 ts=4:
 
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index b51253a..a0ab78c 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -33,11 +33,11 @@ $(eval $(call gb_Library_set_include,unoxml,\
     $$(INCLUDE) \
 ))
 
-))
-
 $(eval $(call gb_Library_add_api,unoxml,\
 	udkapi \
 	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,unoxml,\
     ucbhelper \
     sax \
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 6e3f6d8..4a3828c 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writer
 
 $(eval $(call gb_Library_set_include,writerfilter,\
     $$(INCLUDE) \
-))
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
@@ -67,7 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter,\
     i18nisolang1 \
     i18npaper \
     oox \
-    rtftok \
     sal \
     sot \
     svt \
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 01f149b..b75e630 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Module_Module,writerfilter))
 
 $(eval $(call gb_Module_add_targets,writerfilter,\
-    Library_rtftok \
     Library_writerfilter \
     Package_inc \
     Package_writerfilter_generated \