On Fri, Aug 15, 2014 at 10:47:07AM -0700, Matt Turner wrote: > --- > configure.ac | 1 - > src/mapi/Makefile.am | 40 +++++++++++++++++++++++++++- > src/mapi/es1api/Makefile.am | 64 > --------------------------------------------- > 3 files changed, 39 insertions(+), 66 deletions(-) > delete mode 100644 src/mapi/es1api/Makefile.am
Reviewed-by: Kristian Høgsberg <k...@bitplanet.net> > > diff --git a/configure.ac b/configure.ac > index 97d5394..7ded9e2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2236,7 +2236,6 @@ AC_CONFIG_FILES([Makefile > src/gtest/Makefile > src/loader/Makefile > src/mapi/Makefile > - src/mapi/es1api/Makefile > src/mapi/es1api/glesv1_cm.pc > src/mapi/es2api/Makefile > src/mapi/es2api/glesv2.pc > diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am > index 6b9444a..a32e128 100644 > --- a/src/mapi/Makefile.am > +++ b/src/mapi/Makefile.am > @@ -20,6 +20,7 @@ > # IN THE SOFTWARE. > > SUBDIRS = glapi/gen . > +TESTS = > > TOP = $(top_srcdir) > > @@ -27,6 +28,8 @@ BUILT_SOURCES = > CLEANFILES = $(BUILT_SOURCES) > > lib_LTLIBRARIES = > +pkgconfigdir = $(libdir)/pkgconfig > +pkgconfig_DATA = > > AM_CFLAGS = $(PTHREAD_CFLAGS) > AM_CPPFLAGS = \ > @@ -66,7 +69,42 @@ SUBDIRS += glapi > endif > > if HAVE_OPENGL_ES1 > -SUBDIRS += es1api > +TESTS += es1api/ABI-check > + > +BUILT_SOURCES += es1api/glapi_mapi_tmp.h > + > +pkgconfig_DATA += es1api/glesv1_cm.pc > + > +GLES_includedir = $(includedir)/GLES > +GLES_include_HEADERS = \ > + $(top_srcdir)/include/GLES/egl.h \ > + $(top_srcdir)/include/GLES/gl.h \ > + $(top_srcdir)/include/GLES/glext.h \ > + $(top_srcdir)/include/GLES/glplatform.h > + > +lib_LTLIBRARIES += es1api/libGLESv1_CM.la > + > +es1api_libGLESv1_CM_la_SOURCES = entry.c es1api/glapi_mapi_tmp.h > +es1api_libGLESv1_CM_la_CFLAGS = \ > + $(AM_CFLAGS) \ > + $(VISIBILITY_CFLAGS) > +es1api_libGLESv1_CM_la_CPPFLAGS = \ > + $(AM_CPPFLAGS) \ > + -DMAPI_MODE_BRIDGE \ > + -DMAPI_ABI_HEADER=\"es1api/glapi_mapi_tmp.h\" > +es1api_libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS) > +es1api_libGLESv1_CM_la_LDFLAGS = \ > + -no-undefined \ > + -version-number 1:1 \ > + $(GC_SECTIONS) \ > + $(LD_NO_UNDEFINED) > + > +if HAVE_SHARED_GLAPI > +es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la > +endif > + > +es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) > + $(call glapi_gen_mapi,$<,es1api) > endif > > if HAVE_OPENGL_ES2 > diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am > deleted file mode 100644 > index 63ea5e7..0000000 > --- a/src/mapi/es1api/Makefile.am > +++ /dev/null > @@ -1,64 +0,0 @@ > -# Copyright © 2012 Intel Corporation > -# > -# 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 > -# the rights to use, copy, modify, merge, publish, distribute, sublicense, > -# 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 NONINFRINGEMENT. IN NO EVENT SHALL > -# THE AUTHORS OR COPYRIGHT HOLDERS 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. > - > -AM_CPPFLAGS = \ > - $(DEFINES) \ > - -I$(top_srcdir)/include \ > - -I$(top_srcdir)/src/mapi \ > - -DMAPI_MODE_BRIDGE \ > - -DMAPI_ABI_HEADER=\"glapi_mapi_tmp.h\" > - > -AM_CFLAGS = $(VISIBILITY_CFLAGS) > - > -TESTS = ABI-check > - > -pkgconfigdir = $(libdir)/pkgconfig > -pkgconfig_DATA = glesv1_cm.pc > - > -GLES_includedir = $(includedir)/GLES > -GLES_include_HEADERS = \ > - $(top_srcdir)/include/GLES/egl.h \ > - $(top_srcdir)/include/GLES/gl.h \ > - $(top_srcdir)/include/GLES/glext.h \ > - $(top_srcdir)/include/GLES/glplatform.h > - > -lib_LTLIBRARIES = libGLESv1_CM.la > - > -libGLESv1_CM_la_SOURCES = ../entry.c glapi_mapi_tmp.h > -libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS) > -libGLESv1_CM_la_LDFLAGS = \ > - -no-undefined \ > - -version-number 1:1 \ > - $(GC_SECTIONS) \ > - $(LD_NO_UNDEFINED) > - > -if HAVE_SHARED_GLAPI > -libGLESv1_CM_la_LIBADD += ../shared-glapi/libglapi.la > -endif > - > -include ../glapi/gen/glapi_gen.mk > -glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) > - $(call glapi_gen_mapi,$<,es1api) > - > -BUILT_SOURCES = glapi_mapi_tmp.h > -CLEANFILES = $(BUILT_SOURCES) > - > -include $(top_srcdir)/install-lib-links.mk > -- > 1.8.5.5 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
