[Libreoffice-commits] .: Branch 'feature/gnumake4' - offapi/prj udkapi/prj xmlreader/Library_xmlreader.mk

[Bjoern Michaelsen]

 offapi/prj/build.lst           |    2 +-
 udkapi/prj/build.lst           |    1 -
 xmlreader/Library_xmlreader.mk |   11 +++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit a0b0b120a588509b5c90f7fafbb13ed2a007a2c0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 21:05:27 2011 +0200

    postmerge fixes for gnumake4

diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 6a8001b..22cd4e5 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -1,2 +1,2 @@
 oa	offapi	:	udkapi DESKTOP:idlc solenv NULL
-oa	offapi/prj									nmake	-	all	oa_mkout NULL
+oa	offapi/prj									nmake	-	all	oa_prj NULL
diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst
index b51f2a2..5b76313 100644
--- a/udkapi/prj/build.lst
+++ b/udkapi/prj/build.lst
@@ -1,3 +1,2 @@
 ua	udkapi	:	DESKTOP:idlc DESKTOP:codemaker NULL
-ua	udkapi									usr1	-	all	ua_mkout NULL
 ua	udkapi\prj	nmake	-	all	ua_prj NULL
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index 6d2de94..807af42 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -29,12 +29,6 @@ $(eval $(call gb_Library_Library,xmlreader))
 
 $(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc))
 
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,xmlreader,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
 $(eval $(call gb_Library_add_defs,xmlreader,\
 	-DOOO_DLLIMPLEMENTATION_XMLREADER \
 ))
@@ -50,4 +44,9 @@ $(eval $(call gb_Library_add_exception_objects,xmlreader,\
 	xmlreader/source/xmlreader \
 ))
 
+$(eval $(call gb_Library_add_api,xmlreader,\
+    offapi \
+    udkapi \
+))
+
 # vim: set noet sw=4 ts=4: