[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - connectivity/Library_odbc.mk connectivity/Module_connectivity.mk connectivity/prj

[Peter Foley]

 connectivity/Library_odbc.mk        |   65 ++++++++++++++++++++++++++++++++++++
 connectivity/Module_connectivity.mk |    1 
 connectivity/prj/build.lst          |    1 
 3 files changed, 66 insertions(+), 1 deletion(-)

New commits:
commit 67b2a60b1dcae766b67282c1b234974ef98ea6d8
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Thu Dec 22 18:26:11 2011 -0500

    connectivity: convert odbc to gbuild

diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
new file mode 100644
index 0000000..6744bb7
--- /dev/null
+++ b/connectivity/Library_odbc.mk
@@ -0,0 +1,65 @@
+# -*- 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 at 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,odbc))
+
+$(eval $(call gb_Library_add_package_headers,odbc,connectivity_inc))
+
+$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
+
+$(eval $(call gb_Library_add_api,odbc,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_set_include,odbc,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/source/inc \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_defs,odbc,\
+	-DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,odbc,\
+	odbcbase \
+	cppu \
+	cppuhelper \
+	sal \
+	salhelper \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odbc,\
+	connectivity/source/drivers/odbc/oservices \
+	connectivity/source/drivers/odbc/ORealDriver \
+	connectivity/source/drivers/odbc/OFunctions \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index e6ad773..88118d4 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_dbpool2 \
 	Library_calc \
 	Library_odbcbase \
+	Library_odbc \
 ))
 
 ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index c6c840f..4e8e8b0 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -2,7 +2,6 @@ cn  connectivity    :    shell  TRANSLATIONS:translations comphelper MOZ:moz POS
 cn  connectivity\source\drivers\mozab\mozillasrc    nmake   -   all cn_mozab_mozillasrc cn_file cn_inc NULL
 cn  connectivity\source\drivers\mozab\bootstrap     nmake   -   all cn_mozab_bootstrap cn_mozab_mozillasrc cn_inc NULL
 cn  connectivity\source\drivers\mozab               nmake   -   all cn_mozab cn_mozab_bootstrap cn_dbtools cn_inc NULL
-cn  connectivity\source\drivers\odbc                nmake   -   all cn_odbc cn_odbcbase cn_inc NULL
 cn  connectivity\source\drivers\mysql               nmake   -   all cn_mysql cn_dbtools cn_inc NULL
 cn  connectivity\source\drivers\postgresql          nmake   -   all cn_postgresql cn_dbtools cn_inc NULL
 cn  connectivity\source\drivers\jdbc                nmake   -   all cn_jdbc cn_dbtools cn_inc NULL