unixODBC: remove Package_inc

Change-Id: I99ebfcf2a52fe108599938abad87ab73552e6e2a

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
 

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:

unixODBC/Package_inc.mk

-# -*- 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: