diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:22:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:22:43 +0200 |
| commit | e0b4860fb10ecda319f2770de65c64b4284ec36b (patch) | |
| tree | 36d11299e214eba24710e033e1ef13e38f509db7 | |
| parent | 112be98c928c38c5cc63c99e86e0b58b8d2dfe29 (diff) | |
postmerge fixes for gnumake4
| -rw-r--r-- | unoxml/Library_unordf.mk | 2 | ||||
| -rw-r--r-- | unoxml/Library_unoxml.mk | 4 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 2 | ||||
| -rw-r--r-- | writerfilter/Module_writerfilter.mk | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index f716cf2afa59..2f709ff95bc1 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 b51253a44036..a0ab78c1cc27 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 6e3f6d8e18d0..4a3828c8cb3c 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 01f149b8cac8..b75e63096d8f 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 \ |