summaryrefslogtreecommitdiffstats
path: root/dbaccess/Module_dbaccess.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-12-31 13:35:11 +0200
committerTor Lillqvist <tml@collabora.com>2019-12-31 15:07:09 +0100
commit6eb5cffa1c4ee15bf96fe97769efac65ba785ef9 (patch)
treeeb9e61e5d793cf7ce679f9bdb2d0d5d46d62010f /dbaccess/Module_dbaccess.mk
parenttdf#59666 AutoCorrect: don't capitalize single Greek letters (diff)
downloadcore-6eb5cffa1c4ee15bf96fe97769efac65ba785ef9.tar.gz
core-6eb5cffa1c4ee15bf96fe97769efac65ba785ef9.zip
tdf#129375: Avoid crash when inserting bibliography entry on iOS
I don't really know how the bibliography functionality works and how it is connected to database stuff. Until now Library_bib for instance was excluded for iOS because it was seen to be part of the "DBCONNECTIVITY" feature. Change that now. Also, build the dba and dbahsql libraries also in the non-DBCONNECTIVITY case. This at least avoids the crash and avoids new warnings about missing constructors or factories. Change-Id: I8a8c62a895fcd43e7fa725a4707ac5ad428a64b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86043 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86045 Tested-by: Jenkins
Diffstat (limited to 'dbaccess/Module_dbaccess.mk')
-rw-r--r--dbaccess/Module_dbaccess.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 99073bb80a70..50d601e853ae 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -9,15 +9,22 @@
$(eval $(call gb_Module_Module,dbaccess))
+$(eval $(call gb_Module_add_targets,dbaccess,\
+ Library_dba \
+ Library_dbahsql \
+))
+
+$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
+ AllLangMoTarget_dba \
+))
+
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,dbaccess,\
$(if $(filter WNT,$(OS)),Executable_odbcconfig) \
- Library_dba \
Library_dbaxml \
Library_dbu \
Library_sdbt \
- Library_dbahsql \
UIConfig_dbaccess \
UIConfig_dbapp \
UIConfig_dbbrowser \
@@ -27,10 +34,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
UIConfig_dbtdata \
))
-$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
- AllLangMoTarget_dba \
-))
-
ifneq ($(OS),iOS)
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
$(eval $(call gb_Module_add_check_targets,dbaccess,\