fix connectivity bits in postprocess

Conflicts:
postprocess/Rdb_services.mk

Change-Id: I843a5ccc0408e267cc2f333044f5b7ba39d1bdea
Reviewed-on: https://gerrit.libreoffice.org/5570
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

2 files changed, 64 insertions, 58 deletions

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index c05072e06759..10af27bf4630 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -287,7 +287,7 @@ ifeq ($(WITH_MOZAB4WIN),YES)
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 postprocess_DRIVERS += mozab
 endif
-else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
+else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 postprocess_DRIVERS += mork
 endif
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 5374b101398a..6f14a887d32f 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -122,14 +122,12 @@ $(eval $(call gb_Rdb_add_components,services,\
 		$(if $(filter-out X86_64,$(CPUNAME)), \
 			avmedia/source/quicktime/avmediaQuickTime \
 		) \
-		connectivity/source/drivers/macab/macab1 \
 		lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
 		fpicker/source/aqua/fps_aqua \
 		shell/source/backends/macbe/macbe1 \
 		vcl/vcl.macosx \
 	) \
 	$(if $(filter WNT,$(OS)), \
-		connectivity/source/drivers/ado/ado \
 		dtrans/source/generic/dtrans \
 		dtrans/util/dnd \
 		dtrans/util/ftransl \
@@ -185,9 +183,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 		canvas/source/directx/directx9canvas \
 		canvas/source/directx/gdipluscanvas \
 	) \
-	$(if $(ENABLE_EVOAB2), \
-		connectivity/source/drivers/evoab2/evoab \
-	) \
 	$(if $(ENABLE_GCONF), \
 		shell/source/backends/gconfbe/gconfbe1 \
 	) \
@@ -207,9 +202,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(ENABLE_VLC), \
 		avmedia/source/vlc/avmediavlc \
 	) \
-	$(if $(ENABLE_KAB), \
-		connectivity/source/drivers/kab/kab1 \
-	) \
 	$(if $(ENABLE_KDE), \
 		shell/source/backends/kdebe/kdebe1 \
 	) \
@@ -226,51 +218,89 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(ENABLE_TDE), \
 		shell/source/backends/kdebe/tdebe1 \
 	) \
-	$(if $(ENABLE_TDEAB), \
-		connectivity/source/drivers/kab/tdeab1 \
-	) \
 	$(if $(ENABLE_JAVA), \
 		xmerge/source/bridge/XMergeBridge \
 		scripting/java/ScriptFramework \
 		scripting/java/ScriptProviderForJava \
 		smoketest/org/libreoffice/smoketest/smoketest \
 		wizards/com/sun/star/wizards/form/form \
-		connectivity/source/drivers/hsqldb/hsqldb \
-		connectivity/source/drivers/jdbc/jdbc \
 		wizards/com/sun/star/wizards/query/query \
 		wizards/com/sun/star/wizards/report/report \
 		wizards/com/sun/star/wizards/table/table \
 	) \
-	$(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE), \
-		connectivity/source/drivers/firebird/firebird_sdbc \
-	) \
 ))
 
 ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 
 $(eval $(call gb_Rdb_add_components,services,\
-    connectivity/source/drivers/calc/calc \
-    dbaccess/source/ext/macromigration/dbmm \
-    dbaccess/source/filter/xml/dbaxml \
-    dbaccess/util/dba \
-    dbaccess/util/dbu \
-    dbaccess/util/sdbt \
-    forms/util/frm \
-    reportdesign/util/rpt \
-    reportdesign/util/rptui \
-    reportdesign/util/rptxml \
-    connectivity/source/drivers/dbase/dbase \
-    connectivity/source/cpool/dbpool2 \
-    connectivity/source/dbtools/dbtools \
-    connectivity/source/drivers/flat/flat \
-    connectivity/source/drivers/mysql/mysql \
-    connectivity/source/manager/sdbc2 \
-    shell/source/backends/localebe/localebe1 \
+	extensions/source/bibliography/bib \
+	extensions/source/dbpilots/dbp \
+	extensions/source/propctrlr/pcr \
+	connectivity/source/cpool/dbpool2 \
+	connectivity/source/dbtools/dbtools \
+	$(if $(filter WNT,$(OS)), \
+		connectivity/source/drivers/ado/ado \
+	) \
+	connectivity/source/drivers/calc/calc \
+	connectivity/source/drivers/dbase/dbase \
+	$(if $(ENABLE_EVOAB2), \
+		connectivity/source/drivers/evoab2/evoab \
+	) \
+	$(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE), \
+		connectivity/source/drivers/firebird/firebird_sdbc \
+	) \
+	connectivity/source/drivers/flat/flat \
+	$(if $(ENABLE_KAB), \
+		connectivity/source/drivers/kab/kab1 \
+	) \
+	connectivity/source/drivers/mysql/mysql \
+	$(if $(filter MACOSX,$(OS)), \
+		connectivity/source/drivers/macab/macab1 \
+	) \
+	$(if $(ENABLE_TDEAB), \
+		connectivity/source/drivers/kab/tdeab1 \
+	) \
+	$(if $(SOLAR_JAVA), \
+		connectivity/source/drivers/hsqldb/hsqldb \
+		connectivity/source/drivers/jdbc/jdbc \
+	) \
+	connectivity/source/manager/sdbc2 \
+	dbaccess/source/ext/macromigration/dbmm \
+	dbaccess/source/filter/xml/dbaxml \
+	dbaccess/util/dba \
+	dbaccess/util/dbu \
+	dbaccess/util/sdbt \
+	forms/util/frm \
+	reportdesign/util/rpt \
+	reportdesign/util/rptui \
+	reportdesign/util/rptxml \
+	shell/source/backends/localebe/localebe1 \
 	$(if $(filter-out ANDROID IOS,$(OS)),\
 		connectivity/source/drivers/odbc/odbc \
 	) \
 ))
 
+ifeq ($(OS),WNT)
+
+ifeq ($(WITH_MOZAB4WIN),YES)
+$(eval $(call gb_Rdb_add_components,services,\
+	connectivity/source/drivers/mozab/mozab \
+))
+else
+$(eval $(call gb_Rdb_add_components,services,\
+	connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
+))
+endif
+
+else
+
+$(eval $(call gb_Rdb_add_components,services,\
+	connectivity/source/drivers/mork/mork \
+	connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
+))
+
+endif # WNT
+
 endif # DBCONNECTIVITY
 
 ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
@@ -282,11 +312,8 @@ $(eval $(call gb_Rdb_add_components,services,\
 	desktop/source/offacc/offacc \
 	$(if $(ENABLE_HEADLESS),,desktop/source/splash/spl) \
 	extensions/source/abpilot/abp \
-	extensions/source/bibliography/bib \
 	extensions/source/config/ldap/ldapbe2 \
-	extensions/source/dbpilots/dbp \
 	extensions/source/logging/log \
-	extensions/source/propctrlr/pcr \
 	extensions/source/resource/res \
 	extensions/source/scanner/scn \
 	extensions/source/update/feed/updatefeed \
@@ -306,27 +333,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	) \
 ))
 
-ifeq ($(OS),WNT)
-
-ifeq ($(WITH_MOZAB4WIN),YES)
-$(eval $(call gb_Rdb_add_components,services,\
-	connectivity/source/drivers/mozab/mozab \
-))
-else
-$(eval $(call gb_Rdb_add_components,services,\
-	connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
-))
-endif
-
-else
-
-$(eval $(call gb_Rdb_add_components,services,\
-	connectivity/source/drivers/mork/mork \
-	connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
-))
-
-endif # WNT
-
 endif # DESKTOP
 
 ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)