summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-22 21:26:31 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-22 21:26:31 +0200
commitb71d813a5fa444ecedb6ee9126dab0ef5fe67071 (patch)
treedfc0709a8722618a21fa61304fd419dc9b59467b
parent9f49d873ceb855d160b6e30d41d0978266b7a14a (diff)
postmerge fixes for gnumake4
-rw-r--r--dbaccess/Library_dbui.mk6
-rw-r--r--reportdesign/Library_rptxml.mk4
2 files changed, 7 insertions, 3 deletions
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 5e44b29d3..7bd916721 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 4e4bd0935..639e78430 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 \