[Libreoffice-commits] .: Branch 'feature/gnumake4' - writerfilter/Library_ooxml.mk writerfilter/Library_rtftok.mk

[Bjoern Michaelsen]

 writerfilter/Library_ooxml.mk  |    2 --
 writerfilter/Library_rtftok.mk |    8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c63010032f65d296bcf89a3a93f547605bcc9d3f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 15:53:00 2011 +0200

    remove superfluous include paths

diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index 1d8375c..75d4ed7 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -40,8 +40,6 @@ $(eval $(call gb_Library_set_include,ooxml,\
 	-I$(WORKDIR)/CustomTarget/writerfilter/source \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-    -I$(WORKDIR)/writerfilter/inc \
-    -I$(WORKDIR)/writerfilter/inc/ooxml \
     -I$(OUTDIR)/inc \
 ))
 
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index bfbf8e3..b434545 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -33,9 +33,11 @@ $(eval $(call gb_Library_set_include,rtftok,\
 	-I$(realpath $(SRCDIR)/writerfilter/inc) \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source \
 	-I$(OUTDIR)/inc \
-	-I$(OUTDIR)/inc/offapi \
-	-I$(OUTDIR)/inc/offuh \
-	-I$(OUTDIR)/inc/udkapi \
+))
+
+$(eval $(call gb_Library_add_api,rtftok,\
+	offapi \
+	udkapi \
 ))
 
 include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)