postmerge fixes for gnumake4

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:
 

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 \

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 \

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 \