summaryrefslogtreecommitdiffstats
path: root/connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/Module_connectivity.mk22
1 files changed, 8 insertions, 14 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index a02ec9b7332f..b952594b0084 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -49,8 +49,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-ifneq ($(OS),WNT)
-
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_macab \
@@ -59,14 +57,19 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-endif
-
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_ado \
Library_ado \
))
+
+# "ADO is not available on 64bit" said the commit
+ifeq ($(CPUNAME),INTEL)
+$(eval $(call gb_Module_add_check_targets,connectivity,\
+ CppunitTest_connectivity_ado \
+))
endif
+endif # WNT
ifeq ($(ENABLE_EVOAB2),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
@@ -107,15 +110,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
endif
-ifeq ($(OS),WNT)
-# "ADO is not available on 64bit" said the commit
-ifneq ($(CPUNAME),X86_64)
-$(eval $(call gb_Module_add_check_targets,connectivity,\
- CppunitTest_connectivity_ado \
-))
-endif
-endif
-
ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
Jar_ConnectivityTools \
@@ -137,6 +131,6 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_sharedresources \
))
-endif
+endif # DBCONNECTIVITY
# vim: set noet sw=4 ts=4: