summaryrefslogtreecommitdiff
path: root/dbaccess/Library_dbu.mk
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 12:50:12 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 12:50:12 +0200
commit81ca9771b760858e9db7e4bd595fab4a15113089 (patch)
tree255ea3adfd9a18c2151a7779545c5296ca1b9a8e /dbaccess/Library_dbu.mk
parente70b1417d22d22e3d5bdffb1f4b55bc83a4c36ef (diff)
gnumake4: postmerge fixes in dbaccess reportdesign
Diffstat (limited to 'dbaccess/Library_dbu.mk')
-rw-r--r--dbaccess/Library_dbu.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 7f8c6db47b3c..bce5e77db2d3 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -40,15 +40,13 @@ $(eval $(call gb_Library_set_include,dbu,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,dbu,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbu,\
-DDBACCESS_DLLIMPLEMENTATION \
$(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \
))
ifeq (,$(strip $(PROF_EDITION)))
-$(eval $(call gb_Library_set_defs,dbu,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbu,\
-DWINDOWS_VISTA_PSDK \
))
endif