[Libreoffice-commits] .: Branch 'feature/gnumake4' - dbaccess/Library_dbui.mk reportdesign/Library_rptxml.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Jul 22 12:34:37 PDT 2011
dbaccess/Library_dbui.mk | 6 +++++-
reportdesign/Library_rptxml.mk | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit b71d813a5fa444ecedb6ee9126dab0ef5fe67071
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:26:31 2011 +0200
postmerge fixes for gnumake4
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 5e44b29..7bd9167 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -37,7 +37,11 @@ $(eval $(call gb_Library_set_include,dbui,\
-I$(SRCDIR)/dbaccess/source/inc \
-I$(SRCDIR)/dbaccess/inc/pch \
$$(SOLARINC) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,dbui,\
+ offapi \
+ udkapi \
))
ifeq ($(SYSTEM_ODBC_HEADERS),TRUE)
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 4e4bd09..639e784 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -37,11 +37,11 @@ $(eval $(call gb_Library_set_include,rptxml,\
-I$(OUTDIR)/inc \
))
-))
-
$(eval $(call gb_Library_add_api,rptxml,\
offapi \
udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,rptxml,\
comphelper \
cppu \
More information about the Libreoffice-commits
mailing list