Fix make distcheck.

Well, not quite.  One of the regression tests is failing with
GLXBadFBConfig in that build.  Not sure why.
macos/v1.5.9
Eric Anholt 11 years ago
parent 01ce694073
commit 43acf7b021
  1. 2
      Makefile.am
  2. 1
      configure.ac
  3. 30
      include/epoxy/Makefile.am
  4. 17
      src/Makefile.am

@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src
SUBDIRS = include/epoxy src
if HAVE_X11
SUBDIRS += test

@ -69,6 +69,7 @@ PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
AC_CONFIG_FILES([
epoxy.pc
Makefile
include/epoxy/Makefile
src/Makefile
test/Makefile
])

@ -0,0 +1,30 @@
# Copyright 2005 Adam Jackson.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# on the rights to use, copy, modify, merge, publish, distribute, sub
# license, and/or sell copies of the Software, and to permit persons to whom
# the Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
epoxyincludedir = $(includedir)/epoxy
epoxyinclude_HEADERS = \
gl.h \
$(EGL_INCLUDES) \
$(GLX_INCLUDES) \
$()
EGL_INCLUDES = egl.h
GLX_INCLUDES = glx.h

@ -29,23 +29,8 @@ epoxyincludedir = $(includedir)/epoxy
lib_LTLIBRARIES = libepoxy.la
epoxyinclude_DATA = \
$(GL_INCLUDES) \
$(GLX_INCLUDES) \
$(EGL_INCLUDES) \
$()
GL_INCLUDES = \
../include/epoxy/gl.h \
$(GENERATED_GL_INCLUDES) \
$()
GLX_INCLUDES = \
../include/epoxy/glx.h \
$(GENERATED_GLX_INCLUDES) \
$()
EGL_INCLUDES = \
../include/epoxy/egl.h \
$(GENERATED_EGL_INCLUDES) \
$()
@ -108,9 +93,7 @@ $(GENERATED_GL_SOURCE): $(srcdir)/gen_dispatch.py $(top_srcdir)/registry/gl.xml
$(AM_V_GEN)$(PYTHON) $(srcdir)/gen_dispatch.py --dir $(top_builddir) $(top_srcdir)/registry/gl.xml
$(GENERATED_GLX_SOURCE): $(srcdir)/gen_dispatch.py $(top_srcdir)/registry/glx.xml
$(MKDIR_P) $(top_builddir)/include/epoxy
$(AM_V_GEN)$(PYTHON) $(srcdir)/gen_dispatch.py --dir $(top_builddir) $(top_srcdir)/registry/glx.xml
$(GENERATED_EGL_SOURCE): $(srcdir)/gen_dispatch.py $(top_srcdir)/registry/egl.xml
$(MKDIR_P) $(top_builddir)/include/epoxy
$(AM_V_GEN)$(PYTHON) $(srcdir)/gen_dispatch.py --dir $(top_builddir) $(top_srcdir)/registry/egl.xml

Loading…
Cancel
Save