Mesa: remove Package_inc

Change-Id: Ie87b9b2d7dc87ee60c072a2cf80cda5b191d1209

Mesa/Module_Mesa.mk

@@ -9,10 +9,4 @@
 
 $(eval $(call gb_Module_Module,Mesa))
 
-ifeq ($(SYSTEM_MESA_HEADERS),NO)
-
-$(eval $(call gb_Module_add_targets,Mesa,Package_inc))
-
-endif
-
 # vim: set noet sw=4:

Mesa/Package_inc.mk

@@ -1,23 +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,Mesa_inc,$(SRCDIR)/Mesa/inc))
-
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glext.h,glext.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/gl.h,gl.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/gl_mangle.h,gl_mangle.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glu.h,glu.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glu_mangle.h,glu_mangle.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glxext.h,glxext.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glx.h,glx.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glx_mangle.h,glx_mangle.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/vms_x_fix.h,vms_x_fix.h))
-$(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/wglext.h,wglext.h))
-
-# vim: set noet sw=4:

RepositoryExternal.mk

@@ -78,7 +78,10 @@ gb_LinkTarget__use_mesa_headers :=
 else
 
 define gb_LinkTarget__use_mesa_headers
-$(eval $(call gb_LinkTarget_use_package,$(1),Mesa_inc))
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(SRCDIR)/Mesa/inc \
+	$$(INCLUDE) \
+)
 
 endef