Mesa: remove Package_inc

Change-Id: Ie87b9b2d7dc87ee60c072a2cf80cda5b191d1209

13 files changed, 4 insertions, 30 deletions

diff --git a/Mesa/Module_Mesa.mk b/Mesa/Module_Mesa.mk
index 61cf8855f3d2..377caed83581 100644
--- a/Mesa/Module_Mesa.mk
+++ b/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:
diff --git a/Mesa/Package_inc.mk b/Mesa/Package_inc.mk
deleted file mode 100644
index b5cca090b1fd..000000000000
--- a/Mesa/Package_inc.mk
+++ /dev/null
@@ -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:
diff --git a/Mesa/inc/gl.h b/Mesa/inc/GL/gl.h
index 4945c031e0e7..4945c031e0e7 100644
--- a/Mesa/inc/gl.h
+++ b/Mesa/inc/GL/gl.h
diff --git a/Mesa/inc/gl_mangle.h b/Mesa/inc/GL/gl_mangle.h
index 369b8a0fc6d5..369b8a0fc6d5 100644
--- a/Mesa/inc/gl_mangle.h
+++ b/Mesa/inc/GL/gl_mangle.h
diff --git a/Mesa/inc/glext.h b/Mesa/inc/GL/glext.h
index 449b70d0b459..449b70d0b459 100644
--- a/Mesa/inc/glext.h
+++ b/Mesa/inc/GL/glext.h
diff --git a/Mesa/inc/glu.h b/Mesa/inc/GL/glu.h
index d7f5de9d1c76..d7f5de9d1c76 100644
--- a/Mesa/inc/glu.h
+++ b/Mesa/inc/GL/glu.h
diff --git a/Mesa/inc/glu_mangle.h b/Mesa/inc/GL/glu_mangle.h
index 9c25aa864c13..9c25aa864c13 100644
--- a/Mesa/inc/glu_mangle.h
+++ b/Mesa/inc/GL/glu_mangle.h
diff --git a/Mesa/inc/glx.h b/Mesa/inc/GL/glx.h
index c91a91823048..c91a91823048 100644
--- a/Mesa/inc/glx.h
+++ b/Mesa/inc/GL/glx.h
diff --git a/Mesa/inc/glx_mangle.h b/Mesa/inc/GL/glx_mangle.h
index b0d3d39ac8c1..b0d3d39ac8c1 100644
--- a/Mesa/inc/glx_mangle.h
+++ b/Mesa/inc/GL/glx_mangle.h
diff --git a/Mesa/inc/glxext.h b/Mesa/inc/GL/glxext.h
index 930289c05073..930289c05073 100644
--- a/Mesa/inc/glxext.h
+++ b/Mesa/inc/GL/glxext.h
diff --git a/Mesa/inc/vms_x_fix.h b/Mesa/inc/GL/vms_x_fix.h
index 70454e3d9f53..70454e3d9f53 100644
--- a/Mesa/inc/vms_x_fix.h
+++ b/Mesa/inc/GL/vms_x_fix.h
diff --git a/Mesa/inc/wglext.h b/Mesa/inc/GL/wglext.h
index b5dc7bf7f132..b5dc7bf7f132 100644
--- a/Mesa/inc/wglext.h
+++ b/Mesa/inc/GL/wglext.h
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3acd501c1242..db60dea3aa16 100644
--- a/RepositoryExternal.mk
+++ b/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