Matt Turner <matts...@gmail.com> writes: > A step toward working make dist/distcheck. > --- > configure.ac | 37 ++++++++----------------------------- > src/Makefile.am | 30 +++++++++++++++++++++++++++--- > src/mapi/Makefile.am | 42 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 77 insertions(+), 32 deletions(-) > create mode 100644 src/mapi/Makefile.am > > diff --git a/configure.ac b/configure.ac > index 508b176..c023823 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -694,6 +694,13 @@ if test "x$enable_gles2" = xyes; then > fi > AC_SUBST([API_DEFINES]) > > +AM_CONDITIONAL(HAVE_OPENGL, test "x$enable_opengl" = xyes) > +AM_CONDITIONAL(HAVE_OPENGL_ES1, test "x$enable_gles1" = xyes) > +AM_CONDITIONAL(HAVE_OPENGL_ES2, test "x$enable_gles2" = xyes) > +AM_CONDITIONAL(NEED_OPENGL_COMMON, test "x$enable_opengl" = xyes -o \ > + "x$enable_gles1" = xyes -o \ > + "x$enable_gles2" = xyes)
Looks like HAVE_OPENGL used to be set like NEED_OPENGL_COMMON, and was in use by egl-static/Makefile.am, so that would need updating. Also, if you're making major revisions to patches previously sent to the list, version information would be nice to have. > diff --git a/src/Makefile.am b/src/Makefile.am > index d6a7946..9e265d9 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -1,4 +1,28 @@ > -SUBDIRS=$(SRC_DIRS) > +# Copyright © 2013 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. > > -all-local: > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR) Do we not need this any more? I guess it's in all of the subdirs that generate links into that directory, but it's odd to see it disappear in this commit.
pgp7LBpGyGjm_.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
