fdo#60698: Merge odbcbase into odbc

We odbcbase is just used inside odbc library, so merge them.

Change-Id: I4f4b34873b570ddcf1065c49e5310a1e73092fd6

Repository.mk

@@ -302,7 +302,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	mtfrenderer \
 	mysql \
 	odbc \
-	odbcbase \
 	odfflatxml \
 	offacc \
 	oox \

connectivity/Library_odbc.mk

@@ -20,14 +20,23 @@ $(eval $(call gb_Library_set_include,odbc,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
-$(eval $(call gb_Library_use_external,odbc,odbc_headers))
+$(eval $(call gb_Library_add_defs,odbc,\
+	-DOOO_DLLIMPLEMENTATION_ODBCBASE \
+))
+
+$(eval $(call gb_Library_use_externals,odbc,\
+	boost_headers \
+	odbc_headers \
+))
 
 $(eval $(call gb_Library_use_libraries,odbc,\
-	odbcbase \
 	cppu \
 	cppuhelper \
+	comphelper \
+	dbtools \
 	sal \
 	salhelper \
 	$(gb_UWINAPI) \
@@ -37,6 +46,15 @@ $(eval $(call gb_Library_add_exception_objects,odbc,\
 	connectivity/source/drivers/odbc/oservices \
 	connectivity/source/drivers/odbc/ORealDriver \
 	connectivity/source/drivers/odbc/OFunctions \
+	connectivity/source/drivers/odbc/OPreparedStatement \
+	connectivity/source/drivers/odbc/OStatement \
+	connectivity/source/drivers/odbc/OResultSetMetaData \
+	connectivity/source/drivers/odbc/OResultSet \
+	connectivity/source/drivers/odbc/OTools \
+	connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet \
+	connectivity/source/drivers/odbc/ODatabaseMetaData \
+	connectivity/source/drivers/odbc/ODriver \
+	connectivity/source/drivers/odbc/OConnection \
 ))
 
 # vim: set noet sw=4 ts=4:

connectivity/Library_odbcbase.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,odbcbase))
-
-$(eval $(call gb_Library_set_warnings_not_errors,odbcbase))
-
-$(eval $(call gb_Library_use_sdk_api,odbcbase))
-
-$(eval $(call gb_Library_set_include,odbcbase,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/connectivity/inc \
-	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
-))
-
-$(eval $(call gb_Library_add_defs,odbcbase,\
-	-DOOO_DLLIMPLEMENTATION_ODBCBASE \
-))
-
-$(eval $(call gb_Library_use_externals,odbcbase,\
-	boost_headers \
-	odbc_headers \
-))
-
-$(eval $(call gb_Library_use_libraries,odbcbase,\
-	cppu \
-	cppuhelper \
-	sal \
-	salhelper \
-	dbtools \
-	comphelper \
-	$(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,odbcbase,\
-	connectivity/source/drivers/odbcbase/OPreparedStatement \
-	connectivity/source/drivers/odbcbase/OStatement \
-	connectivity/source/drivers/odbcbase/OResultSetMetaData \
-	connectivity/source/drivers/odbcbase/OResultSet \
-	connectivity/source/drivers/odbcbase/OTools \
-	connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet \
-	connectivity/source/drivers/odbcbase/ODatabaseMetaData \
-	connectivity/source/drivers/odbcbase/ODriver \
-	connectivity/source/drivers/odbcbase/OConnection \
-))
-
-# vim: set noet sw=4 ts=4:

connectivity/Module_connectivity.mk

@@ -23,9 +23,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_file \
 	Library_flat \
 	Library_mysql \
-	$(if $(filter ANDROID IOS,$(OS)),, \
-		Library_odbc \
-		Library_odbcbase) \
+	$(if $(filter ANDROID IOS,$(OS)),,Library_odbc) \
 	Library_sdbc2 \
 ))
 

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -69,7 +69,6 @@ gb_EXTRAMERGEDLIBS := \
 	$(if $(filter-out WNT,$(OS)),$(call gb_Helper_optional,DBCONNECTIVITY,mork)) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
 	$(if $(filter-out ANDROID IOS,$(OS)),odbc) \
-	$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
 	odfflatxml \
 	offacc \
 	oox \