summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEric Le Bihan <eric.le.bihan.dev@free.fr>2017-06-12 12:00:07 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-06-14 16:55:13 +0100
commit2154defcd698c7f9862bd235925cac75c0d5a520 (patch)
tree4c4a2d4f93296efdb495f7f8be76dc2ccfd26c57 /src
parentc1eedb43f32f6a3733f26e7918eb028f68bd60a4 (diff)
Fix khrplatform.h not installed if EGL is disabled.
KHR/khrplatform.h is required by the EGL, GLES and VG headers, but is only installed if Mesa3d is compiled with EGL support. This patch installs this header file unconditionally. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77240 Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src')
-rw-r--r--src/egl/Makefile.am3
-rw-r--r--src/mapi/Makefile.am3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 14fd77f14a9..81090387b58 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -163,9 +163,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = main/egl.pc
-khrdir = $(includedir)/KHR
-khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
-
egldir = $(includedir)/EGL
egl_HEADERS = \
$(top_srcdir)/include/EGL/eglext.h \
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index e5477364ce5..9ff70a14fdd 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -241,3 +241,6 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
$(srcdir)/glapi/gen/gl_and_es_API.xml > $@
include $(top_srcdir)/install-lib-links.mk
+
+khrdir = $(includedir)/KHR
+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h