diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2016-10-04 11:05:30 -0400 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-10-06 15:03:46 +0100 |
| commit | a89faa2022fd995af2019c886b152b49a01f9392 (patch) | |
| tree | 700f2e641c28e7070d2282b157d657b7a0f8a1ef /src | |
| parent | 0216a16819f86bc9030c9bf4d8f377833e6e33dd (diff) | |
| download | external_mesa3d-a89faa2022fd995af2019c886b152b49a01f9392.zip external_mesa3d-a89faa2022fd995af2019c886b152b49a01f9392.tar.gz external_mesa3d-a89faa2022fd995af2019c886b152b49a01f9392.tar.bz2 | |
autoconf: Make header install distinct for various APIs (v2)
This fixes a problem where GL headers would only get installed if
glx was enabled. So if osmesa was enabled but not glx, then the
GL headers required by osmesa would be missing from the install.
v2: Dropped unneeded mesa_glinterop.h redundant osmesa.h install
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Chuck Atkins <chuck.atkins@kitware.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 24 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 10 |
2 files changed, 24 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 551f431..91d6a7a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,6 +47,30 @@ CLEANFILES = $(BUILT_SOURCES) SUBDIRS = . gtest util mapi/glapi/gen mapi +if HAVE_OPENGL +gldir = $(includedir)/GL +gl_HEADERS = \ + $(top_srcdir)/include/GL/gl.h \ + $(top_srcdir)/include/GL/glext.h \ + $(top_srcdir)/include/GL/glcorearb.h \ + $(top_srcdir)/include/GL/gl_mangle.h +endif + +if HAVE_GLX +glxdir = $(includedir)/GL +glx_HEADERS = \ + $(top_srcdir)/include/GL/glx.h \ + $(top_srcdir)/include/GL/glxext.h \ + $(top_srcdir)/include/GL/glx_mangle.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = mesa/gl.pc +endif + +if HAVE_COMMON_OSMESA +osmesadir = $(includedir)/GL +osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h +endif + # include only conditionally ? SUBDIRS += compiler diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 037384a..9710c7f 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -33,11 +33,6 @@ if HAVE_OSMESA SUBDIRS += drivers/osmesa endif -if HAVE_GLX -gldir = $(includedir)/GL -gl_HEADERS = $(top_srcdir)/include/GL/*.h -endif - include Makefile.sources EXTRA_DIST = \ @@ -161,11 +156,6 @@ libmesa_sse41_la_SOURCES = \ libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) -if HAVE_GLX -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gl.pc -endif - MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS) LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS) |