diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:07:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:07:24 +0200 |
| commit | c81f9104b6b6a91588c7a74bbb50a0c9c9729e1a (patch) | |
| tree | be3b7a4178a549d061ca397081fa5589ddbf8d03 /sax | |
| parent | a233dac0653f3f3054f7ad2da114ed989747e89a (diff) | |
postmerge fixes for gnumake4
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/CppunitTest_sax.mk | 7 | ||||
| -rw-r--r-- | sax/Library_expwrap.mk | 6 | ||||
| -rw-r--r-- | sax/Library_fastsax.mk | 6 | ||||
| -rw-r--r-- | sax/Library_sax.mk | 6 |
4 files changed, 18 insertions, 7 deletions
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index d29632de5fae..9a292c49a89f 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -38,9 +38,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_set_include,sax_cppunit,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ +$(eval $(call gb_CppunitTest_add_api,sax_cppunit,\ + offapi \ + udkapi \ )) - # vim: set noet sw=4 ts=4: diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 05bddd0a03b5..5b9bd34c3345 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap) $(eval $(call gb_Library_set_include,expwrap,\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(SRCDIR)/sax/inc \ )) +$(eval $(call gb_Library_add_api,expwrap,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,expwrap,\ cppu \ cppuhelper \ diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index 2dd9dccf0e52..f347842967be 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax $(eval $(call gb_Library_set_include,fastsax,\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(SRCDIR)/sax/inc \ )) +$(eval $(call gb_Library_add_api,fastsax,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,fastsax,\ cppu \ cppuhelper \ diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index f3e089ea8375..4ac6c561faa3 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -33,10 +33,14 @@ $(eval $(call gb_Library_add_package_headers,sax,\ $(eval $(call gb_Library_set_include,sax,\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(SRCDIR)/sax/inc \ )) +$(eval $(call gb_Library_add_api,sax,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) |