diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-06 20:09:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-07 01:41:24 +0200 |
| commit | fea65aaa81938372f5c9a2689db32c73618699b3 (patch) | |
| tree | 168b59e660ca4032887d1cea18fedea2c9254b9c | |
| parent | 6b2ce087e1c3d592875eb36ae6ac2b6f20e248dd (diff) | |
unixODBC: remove Package_inc
Change-Id: I99ebfcf2a52fe108599938abad87ab73552e6e2a
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | unixODBC/Module_unixODBC.mk | 8 | ||||
| -rw-r--r-- | unixODBC/Package_inc.mk | 17 | ||||
| -rw-r--r-- | unixODBC/inc/odbc/sql.h (renamed from unixODBC/inc/sql.h) | 0 | ||||
| -rw-r--r-- | unixODBC/inc/odbc/sqlext.h (renamed from unixODBC/inc/sqlext.h) | 0 | ||||
| -rw-r--r-- | unixODBC/inc/odbc/sqltypes.h (renamed from unixODBC/inc/sqltypes.h) | 0 | ||||
| -rw-r--r-- | unixODBC/inc/odbc/sqlucode.h (renamed from unixODBC/inc/sqlucode.h) | 0 |
7 files changed, 4 insertions, 26 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index db60dea3aa16..2d40dc09b589 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -122,7 +122,10 @@ endef else define gb_LinkTarget__use_odbc_headers -$(call gb_LinkTarget_use_package,$(1),odbc_inc) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(SRCDIR)/unixODBC/inc \ + $$(INCLUDE) \ +) endef diff --git a/unixODBC/Module_unixODBC.mk b/unixODBC/Module_unixODBC.mk index 6bce6bd789be..89822865a042 100644 --- a/unixODBC/Module_unixODBC.mk +++ b/unixODBC/Module_unixODBC.mk @@ -11,12 +11,4 @@ $(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: diff --git a/unixODBC/Package_inc.mk b/unixODBC/Package_inc.mk deleted file mode 100644 index 723730d4e2d5..000000000000 --- a/unixODBC/Package_inc.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,odbc_inc,$(SRCDIR)/unixODBC/inc)) - -$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sql.h,sql.h)) -$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sqlext.h,sqlext.h)) -$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sqltypes.h,sqltypes.h)) -$(eval $(call gb_Package_add_file,odbc_inc,inc/external/odbc/sqlucode.h,sqlucode.h)) - -# vim: set noet sw=4 ts=4: diff --git a/unixODBC/inc/sql.h b/unixODBC/inc/odbc/sql.h index a81c482b0f5c..a81c482b0f5c 100644 --- a/unixODBC/inc/sql.h +++ b/unixODBC/inc/odbc/sql.h diff --git a/unixODBC/inc/sqlext.h b/unixODBC/inc/odbc/sqlext.h index 6520bddad8af..6520bddad8af 100644 --- a/unixODBC/inc/sqlext.h +++ b/unixODBC/inc/odbc/sqlext.h diff --git a/unixODBC/inc/sqltypes.h b/unixODBC/inc/odbc/sqltypes.h index 1b0f9d590555..1b0f9d590555 100644 --- a/unixODBC/inc/sqltypes.h +++ b/unixODBC/inc/odbc/sqltypes.h diff --git a/unixODBC/inc/sqlucode.h b/unixODBC/inc/odbc/sqlucode.h index 366dab75127a..366dab75127a 100644 --- a/unixODBC/inc/sqlucode.h +++ b/unixODBC/inc/odbc/sqlucode.h |