diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-19 16:32:41 -0500 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:24:26 +0200 |
| commit | 7eada778faee1e31e4cf97f4e2a127833131c321 (patch) | |
| tree | feea89f78516bb9cb2685d6d19190f8b1616ed12 | |
| parent | connectivity: convert dbt to gbuild (diff) | |
| download | core-7eada778faee1e31e4cf97f4e2a127833131c321.tar.gz core-7eada778faee1e31e4cf97f4e2a127833131c321.zip | |
connectivity: convert sdbc2 to gbuild
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | connectivity/Library_sdbc2.mk | 55 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 1 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 4 |
4 files changed, 58 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index a8cb169bec3e..13886b74e4b2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -313,6 +313,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ scn \ scui \ sd \ + sdbc2 \ sdbt \ sdd \ sdfilt \ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk new file mode 100644 index 000000000000..59a2900a128e --- /dev/null +++ b/connectivity/Library_sdbc2.mk @@ -0,0 +1,55 @@ +# -*- 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) 2011 Peter Foley <pefoley2@verizon.net> (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_Library_Library,sdbc2)) + +$(eval $(call gb_Library_add_package_headers,sdbc2,connectivity_inc)) + +$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2)) + + +$(eval $(call gb_Library_add_api,sdbc2,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,sdbc2,\ + cppu \ + cppuhelper \ + comphelper \ + dbtools \ + utl \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,sdbc2,\ + connectivity/source/manager/mdrivermanager \ + connectivity/source/manager/mregistration \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index bf64cb6af8c9..901a42cc5e72 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Package_inc \ Jar_sdbc_hsqldb \ Library_dbtools \ + Library_sdbc2 \ )) # vim: set noet sw=4 ts=4: diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 07b61e9cbfa3..c9d8c84e9256 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -43,6 +43,7 @@ my_components = \ component/canvas/source/vcl/vclcanvas \ component/comphelper/util/comphelp \ component/connectivity/source/dbtools/dbtools \ + component/connectivity/source/manager/sdbc2 \ component/configmgr/source/configmgr \ component/cppcanvas/source/uno/mtfrenderer \ component/cui/util/cui \ @@ -150,9 +151,6 @@ my_components += \ localebe1 \ mysql \ odbc \ - sdbc2 \ - -.ENDIF .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" |