[Libreoffice-commits] core.git: connectivity/Module_connectivity.mk

Caolán McNamara caolanm at redhat.com
Tue Dec 20 09:28:43 UTC 2016


 connectivity/Module_connectivity.mk |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c00b5ee5f2bab4e10f113e09372bd151d852912b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 19 21:41:12 2016 +0000

    always have dbtools
    
    Change-Id: I6a3658a275c520c95490df2bb4c99ad3e3a15cef
    Reviewed-on: https://gerrit.libreoffice.org/32208
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index aee3178..e7043a7 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -11,6 +11,12 @@
 $(eval $(call gb_Module_Module,connectivity))
 
 $(eval $(call gb_Module_add_targets,connectivity,\
+	Library_dbtools \
+))
+
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+
+$(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_calc \
 	Configuration_dbase \
 	Configuration_flat \
@@ -19,7 +25,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_calc \
 	Library_dbase \
 	Library_dbpool2 \
-	Library_dbtools \
 	Library_file \
 	Library_flat \
 	Library_mysql \
@@ -132,4 +137,6 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\
 	CppunitTest_connectivity_commontools \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list