connectivity: convert configuration

connectivity/Configuration_ado.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_ado))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_ado,connectivity/registry/ado,\
+	org/openoffice/Office/DataAccess/Drivers-ado.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_ado,connectivity/registry/ado,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_calc.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_calc))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_calc,connectivity/registry/calc,\
+	org/openoffice/Office/DataAccess/Drivers-calc.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_calc,connectivity/registry/calc,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_dbase.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_dbase))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_dbase,connectivity/registry/dbase,\
+	org/openoffice/Office/DataAccess/Drivers-dbase.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_dbase,connectivity/registry/dbase,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_evoab2.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_evoab2))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_evoab2,connectivity/registry/evoab2,\
+	org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_evoab2,connectivity/registry/evoab2,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_flat.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_flat))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_flat,connectivity/registry/flat,\
+	org/openoffice/Office/DataAccess/Drivers-flat.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_flat,connectivity/registry/flat,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_hsqldb.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_hsqldb))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_hsqldb,connectivity/registry/hsqldb,\
+	org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_hsqldb,connectivity/registry/hsqldb,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_jdbc.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_jdbc))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_jdbc,connectivity/registry/jdbc,\
+	org/openoffice/Office/DataAccess/Drivers-jdbc.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_jdbc,connectivity/registry/jdbc,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_kab.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_kab))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_kab,connectivity/registry/kab,\
+	org/openoffice/Office/DataAccess/Drivers-kab.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_kab,connectivity/registry/kab,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_macab.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_macab))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_macab,connectivity/registry/macab,\
+	org/openoffice/Office/DataAccess/Drivers-macab.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_macab,connectivity/registry/macab,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_mozab.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_mozab))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_mozab,connectivity/registry/mozab,\
+	org/openoffice/Office/DataAccess/Drivers-mozab.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_mozab,connectivity/registry/mozab,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_mozab2.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_mozab2))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_mozab2,connectivity/registry/mozab2,\
+	org/openoffice/Office/DataAccess/Drivers-mozab2.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_mozab2,connectivity/registry/mozab2,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_mysql.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_mysql))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_mysql,connectivity/registry/mysql,\
+	org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_mysql,connectivity/registry/mysql,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_odbc.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_odbc))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_odbc,connectivity/registry/odbc,\
+	org/openoffice/Office/DataAccess/Drivers-odbc.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_odbc,connectivity/registry/odbc,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Configuration_postgresql.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_postgresql))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_postgresql,connectivity/registry/postgresql,\
+	org/openoffice/Office/DataAccess/Drivers-postgresql.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_postgresql,connectivity/registry/postgresql,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Module_connectivity.mk

@@ -31,6 +31,11 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	AllLangResTarget_cnr \
 	AllLangResTarget_sdbcl \
 	AllLangResTarget_sdberr \
+	Configuration_calc \
+	Configuration_dbase \
+	Configuration_flat \
+	Configuration_mysql \
+	Configuration_odbc \
 	Library_calc \
 	Library_dbase \
 	Library_dbpool2 \
@@ -49,6 +54,8 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	AllLangResTarget_hsqldb \
+	Configuration_hsqldb \
+	Configuration_jdbc \
 	Jar_ConnectivityTools \
 	Jar_sdbc_hsqldb \
 	Library_hsqldb \
@@ -60,6 +67,7 @@ ifeq ($(GUI),UNX)
 
 ifeq ($(ENABLE_KAB),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_kab \
 	Library_kab1 \
 	Library_kabdrv1 \
 ))
@@ -67,6 +75,7 @@ endif
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_macab \
 	Library_macab1 \
 	Library_macabdrv1 \
 ))
@@ -76,18 +85,21 @@ endif
 
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_ado \
 	Library_ado \
 ))
 endif
 
 ifeq ($(ENABLE_EVOAB2),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_evoab2 \
 	Library_evoab2 \
 ))
 endif
 
 ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
 $(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_postgresql \
 	Library_postgresql-sdbc \
 	Library_postgresql-sdbc-impl \
 	Package_postgresql-sdbc \
@@ -100,10 +112,22 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_mozbootstrap \
 ))
 else
+
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_mozab \
 	Library_mozabdrv \
 ))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_mozab \
+))
+else
+$(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_mozab2 \
+))
+endif
+
 endif
 
 # FIXME: Does not work. Convert to JUnit.

postprocess/packregistry/makefile.mk

@@ -75,7 +75,7 @@ MY_FILES_calc = \
 
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
 MY_FILES_calc += \
-    $(MY_MOD)/DataAccess/calc.xcu
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
 .ENDIF
 
 MY_DEPS_cjk = main
@@ -281,14 +281,14 @@ MY_FILES_main = \
     $(MY_MOD)/org/openoffice/TypeDetection/UISort-writer.xcu
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
 MY_FILES_main += \
-    $(MY_MOD)/DataAccess/dbase.xcu \
-    $(MY_MOD)/DataAccess/flat.xcu \
-    $(MY_MOD)/DataAccess/mysql.xcu \
-    $(MY_MOD)/DataAccess/odbc.xcu
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
 .ENDIF
 .IF "$(GUIBASE)" == "aqua"
 MY_FILES_main += \
-    $(MY_MOD)/DataAccess/macab.xcu \
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-macab.xcu \
     $(MY_MOD)/org/openoffice/Inet-macosx.xcu \
     $(MY_MOD)/org/openoffice/Office/Accelerators-macosx.xcu \
     $(MY_MOD)/org/openoffice/Office/Common-macosx.xcu \
@@ -308,7 +308,7 @@ MY_FILES_main += \
         # VCL-unixdesktop.xcu must come after VCL.xcu
 .ELIF "$(GUIBASE)" == "WIN"
 MY_FILES_main += \
-    $(MY_MOD)/DataAccess/ado.xcu \
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-ado.xcu \
     $(MY_MOD)/org/openoffice/Inet-wnt.xcu \
     $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
     $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
@@ -324,26 +324,26 @@ MY_FILES_main += \
 ERROR : unknown-GUIBASE
 .END
 .IF "$(ENABLE_EVOAB2)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 .END
 .IF "$(SOLAR_JAVA)" == "TRUE"
 MY_FILES_main += \
-    $(MY_MOD)/DataAccess/hsqldb.xcu \
-    $(MY_MOD)/DataAccess/jdbc.xcu
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \
+    $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu
 .END
 .IF "$(ENABLE_TDEAB)" == "TRUE"
 MY_FILES_main += $(MY_MOD)/DataAccess/tdeab.xcu
 .END
 .IF "$(ENABLE_KAB)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/DataAccess/kab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
 .END
 .IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
         "$(OS)" != "MACOSX"
 .IF "$(OS)" == "WNT"
-MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 .ELSE
-MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab2.xcu
 .END
 .END
 .IF "$(SYSTEM_LIBEXTTEXTCAT_DATA)" != ""
@@ -439,7 +439,7 @@ MY_FILES_binfilter = \
 .IF "$(BUILD_POSTGRESQL_SDBC)" == "YES"
 MY_XCDS += $(MISC)/postgresqlsdbc.xcd
 MY_DEPS_postgresqlsdbc = main
-MY_FILES_postgresqlsdbc = $(MY_MOD)/DataAccess/postgresql.xcu
+MY_FILES_postgresqlsdbc = $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
 .END
 
 .IF "$(GUIBASE)" == "unx" && \