diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-12-04 12:12:01 -0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-24 09:12:16 +0000 |
| commit | 692c724f5e71f685c269085983828e7539274ecb (patch) | |
| tree | 6537a43ac630470fda9ec55ac0301d66022af9fa /connectivity/Library_odbc.mk | |
| parent | oox: whitespace fixes in WpgContext (diff) | |
| download | core-692c724f5e71f685c269085983828e7539274ecb.tar.gz core-692c724f5e71f685c269085983828e7539274ecb.zip | |
fdo#60698: Merge odbcbase into odbc
We odbcbase is just used inside odbc library, so merge them.
Change-Id: I4f4b34873b570ddcf1065c49e5310a1e73092fd6
Diffstat (limited to 'connectivity/Library_odbc.mk')
| -rw-r--r-- | connectivity/Library_odbc.mk | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 82d447c4fc8b..a29ccc29352a 100644 --- a/connectivity/Library_odbc.mk +++ b/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: |