summaryrefslogtreecommitdiff
path: root/svx/Library_svx.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-22 09:26:33 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-22 09:43:44 +0300
commite15223582710e9e2e31fad2f557df6ee99501fd0 (patch)
tree84dfa0f72c9a8a813d0b09b5f4e3954e105cdbfe /svx/Library_svx.mk
parentcf8946d10226272e8a0e6f1b1043b54d4b63db8d (diff)
More hacking on --disable-database-connectivity
Work in progress, still lots of undefineds when attempting to link TiledLibreOffice. Change-Id: I80fa330768d9f9fa9ef65e3693f1d777c0713210
Diffstat (limited to 'svx/Library_svx.mk')
-rw-r--r--svx/Library_svx.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 2f0e9a49a89d..3f9ded6faf37 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -247,12 +247,11 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/unogallery/unogalthemeprovider \
))
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/fmcomp/dbaobjectex \
svx/source/form/databaselocationinput \
svx/source/form/dbcharsethelper \
- svx/source/form/filtnav \
+ $(call gb_Helper_optional,DBCONNECTIVITY,svx/source/form/filtnav) \
svx/source/form/fmobjfac \
svx/source/form/fmPropBrw \
svx/source/form/fmsrccfg \
@@ -260,7 +259,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/form/tabwin \
svx/source/form/tbxform \
))
-endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,svx,\