diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-07 13:46:59 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:24:42 +0200 |
| commit | 5eff0b6c58c9a033e4794d9de76fcd777e49d09d (patch) | |
| tree | 8d2508c1b0048d3a604264dd93054333267a0352 | |
| parent | 7a72abad2326bbb15843d35f579ae6f4e2fb947a (diff) | |
improve odbc headers handling
| -rw-r--r-- | RepositoryExternal.mk | 18 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | connectivity/Library_odbc.mk | 6 | ||||
| -rw-r--r-- | connectivity/Library_odbcbase.mk | 6 | ||||
| -rw-r--r-- | dbaccess/Library_dbu.mk | 3 | ||||
| -rw-r--r-- | unixODBC/Module_unixODBC.mk | 7 |
6 files changed, 29 insertions, 12 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5037f29200c7..34b005e3cdd1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -48,6 +48,24 @@ endef endif +ifeq ($(SYSTEM_ODBC_HEADERS),YES) + +define gb_LinkTarget__use_odbc_headers +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_ODBC_HEADERS \ +) + +endef + +else + +define gb_LinkTarget__use_odbc_headers +$(call gb_LinkTarget_use_package,$(1),odbc_inc) + +endef + +endif + ifeq ($(SYSTEM_CPPUNIT),YES) define gb_LinkTarget__use_cppunit diff --git a/configure.in b/configure.in index 2382c83a83d7..dd8420565516 100644 --- a/configure.in +++ b/configure.in @@ -7403,7 +7403,6 @@ elif test "$enable_database_connectivity" != yes; then else AC_MSG_RESULT([internal]) SYSTEM_ODBC_HEADERS=NO - BUILD_TYPE="$BUILD_TYPE UNIXODBC" fi AC_SUBST(SYSTEM_ODBC_HEADERS) diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index ee10b8061813..e78f9dc5ce48 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -40,11 +40,7 @@ $(eval $(call gb_Library_set_include,odbc,\ -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_use_external,odbc,odbc_headers)) $(eval $(call gb_Library_add_linked_libs,odbc,\ odbcbase \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 02f741c1c8ef..1bf2500dad37 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -46,11 +46,7 @@ $(eval $(call gb_Library_add_defs,odbcbase,\ -DOOO_DLLIMPLEMENTATION_ODBCBASE \ )) -ifeq ($(SYSTEM_ODBC_HEADERS),YES) -$(eval $(call gb_Library_add_defs,odbcbase,\ - -DSYSTEM_ODBC_HEADERS \ -)) -endif +$(eval $(call gb_Library_use_external,odbcbase,odbc_headers)) $(eval $(call gb_Library_add_linked_libs,odbcbase,\ cppu \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 5d9462cba737..2f8fdb032b79 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_api,dbu,\ $(eval $(call gb_Library_add_defs,dbu,\ -DDBACCESS_DLLIMPLEMENTATION \ - $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \ )) ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h @@ -51,6 +50,8 @@ $(eval $(call gb_Library_add_cxxflags,dbu,\ )) endif +$(eval $(call gb_Library_use_external,dbu,odbc_headers)) + $(eval $(call gb_Library_use_libraries,dbu,\ comphelper \ cppu \ diff --git a/unixODBC/Module_unixODBC.mk b/unixODBC/Module_unixODBC.mk index 084094c2dfb6..64bdca3899b1 100644 --- a/unixODBC/Module_unixODBC.mk +++ b/unixODBC/Module_unixODBC.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # @@ -29,6 +30,12 @@ $(eval $(call gb_Module_Module,unixODBC)) +ifeq ($(SYSTEM_ODBC_HEADERS),NO) + $(eval $(call gb_Module_add_targets,unixODBC,\ Package_inc \ )) + +endif + +# vim: set noet sw=4 ts=4: |