summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-22 21:05:27 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-22 21:05:27 +0200
commit58b501f5cf1f044c3c1184f517b17da8be0984a1 (patch)
tree171c1712d33ff46eb7ac1ced5add31807b6305cc
parentfcb8c3c297e3f14f6af280614d37bd7c86b90d49 (diff)
postmerge fixes for gnumake4
-rw-r--r--offapi/prj/build.lst2
-rw-r--r--udkapi/prj/build.lst1
-rw-r--r--xmlreader/Library_xmlreader.mk11
3 files changed, 6 insertions, 8 deletions
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 6a8001b4385e..22cd4e591190 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 b51f2a247520..5b763130cd9c 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 6d2de9479436..807af424e252 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: