diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:05:27 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:05:27 +0200 |
| commit | a0b0b120a588509b5c90f7fafbb13ed2a007a2c0 (patch) | |
| tree | cc50b7219c1d4d9135c78ce8e7417adbb3799558 | |
| parent | 5b5501f54ec560bf7a5e3ac1b1257b6072a69057 (diff) | |
postmerge fixes for gnumake4
| -rw-r--r-- | offapi/prj/build.lst | 2 | ||||
| -rw-r--r-- | udkapi/prj/build.lst | 1 | ||||
| -rw-r--r-- | xmlreader/Library_xmlreader.mk | 11 |
3 files changed, 6 insertions, 8 deletions
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst index 6a8001b43..22cd4e591 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 b51f2a247..5b763130c 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 6d2de9479..807af424e 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: |