From b308a876d3713a3ef7fcf206d7dd488737ae889f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 5 Nov 2019 13:22:31 -0800 Subject: [PATCH] autotools: Include meson.build and meson_options.txt in dist --- Makefile.am | 4 +++- include/Makefile.am | 1 + src/EGL/Makefile.am | 4 +++- src/GL/Makefile.am | 3 ++- src/GLESv1/Makefile.am | 3 ++- src/GLESv2/Makefile.am | 3 ++- src/GLX/Makefile.am | 3 ++- src/GLdispatch/Makefile.am | 5 ++++- src/GLdispatch/vnd-glapi/Makefile.am | 1 + src/Makefile.am | 4 +++- src/OpenGL/Makefile.am | 3 ++- src/util/Makefile.am | 2 +- tests/Makefile.am | 3 ++- tests/dummy/Makefile.am | 4 +++- 14 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index e901526..721e476 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,9 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ autogen.sh \ README.md \ - bin/symbols-check.py + bin/symbols-check.py \ + meson.build \ + meson_options.txt pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libglvnd.pc diff --git a/include/Makefile.am b/include/Makefile.am index c821de1..800ed55 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -76,3 +76,4 @@ else noinst_HEADERS += $(EGL_HEADER_FILES) endif +EXTRA_DIST = meson.build \ No newline at end of file diff --git a/src/EGL/Makefile.am b/src/EGL/Makefile.am index 5d39da7..0d1e98d 100644 --- a/src/EGL/Makefile.am +++ b/src/EGL/Makefile.am @@ -119,7 +119,9 @@ TESTS = egl-symbol-check.sh EXTRA_DIST = \ egl-symbol-check.sh \ - egl.symbols + egl.symbols \ + meson.build pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = egl.pc + diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am index c88db0d..36788f6 100644 --- a/src/GL/Makefile.am +++ b/src/GL/Makefile.am @@ -83,4 +83,5 @@ pkgconfig_DATA = gl.pc EXTRA_DIST = \ gl-symbol-check.sh \ - gl.symbols + gl.symbols \ + meson.build diff --git a/src/GLESv1/Makefile.am b/src/GLESv1/Makefile.am index dcd8671..969d1c0 100644 --- a/src/GLESv1/Makefile.am +++ b/src/GLESv1/Makefile.am @@ -50,4 +50,5 @@ TESTS = glesv1-symbol-check.sh EXTRA_DIST = \ glesv1-symbol-check.sh \ - glesv1.symbols + glesv1.symbols \ + meson.build diff --git a/src/GLESv2/Makefile.am b/src/GLESv2/Makefile.am index cf3ee9d..a6c261d 100644 --- a/src/GLESv2/Makefile.am +++ b/src/GLESv2/Makefile.am @@ -50,4 +50,5 @@ TESTS = glesv2-symbol-check.sh EXTRA_DIST = \ glesv2-symbol-check.sh \ - glesv2.symbols + glesv2.symbols \ + meson.build diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am index b071dc1..33a1bc5 100644 --- a/src/GLX/Makefile.am +++ b/src/GLX/Makefile.am @@ -93,4 +93,5 @@ TESTS = glx-symbol-check.sh EXTRA_DIST += \ glx-symbol-check.sh \ - glx.symbols + glx.symbols \ + meson.build diff --git a/src/GLdispatch/Makefile.am b/src/GLdispatch/Makefile.am index ca66f3c..2f7ce93 100644 --- a/src/GLdispatch/Makefile.am +++ b/src/GLdispatch/Makefile.am @@ -56,4 +56,7 @@ libGLdispatch_la_LIBADD += ../util/libglvnd_pthread.la libGLdispatch_la_LIBADD += ../util/libapp_error_check.la libGLdispatch_la_LIBADD += @LIB_DL@ -EXTRA_DIST = export_list_tls.ver export_list_tsd.ver +EXTRA_DIST = \ + export_list_tls.ver \ + export_list_tsd.ver \ + meson.build diff --git a/src/GLdispatch/vnd-glapi/Makefile.am b/src/GLdispatch/vnd-glapi/Makefile.am index 98c1e15..cd8cb65 100644 --- a/src/GLdispatch/vnd-glapi/Makefile.am +++ b/src/GLdispatch/vnd-glapi/Makefile.am @@ -120,3 +120,4 @@ g_glapi_mapi_glesv2_tmp.h : $(glapi_gen_mapi_deps) endif CLEANFILES = $(BUILT_SOURCES) +EXTRA_DIST = meson.build diff --git a/src/Makefile.am b/src/Makefile.am index 821346f..c9551c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,9 @@ EXTRA_DIST = \ generate/xml/gl.xml \ generate/xml/gl_other.xml \ generate/xml/glx.xml \ - generate/xml/glx_other.xml + generate/xml/glx_other.xml \ + generate/meson.build \ + meson.build clean-local: rm -f generate/*.pyc diff --git a/src/OpenGL/Makefile.am b/src/OpenGL/Makefile.am index ce9e8d1..edcfe3a 100644 --- a/src/OpenGL/Makefile.am +++ b/src/OpenGL/Makefile.am @@ -59,4 +59,5 @@ TESTS = ogl-symbol-check.sh EXTRA_DIST = \ ogl-symbol-check.sh \ - ogl.symbols + ogl.symbols \ + meson.build diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 7eb4d99..73c3836 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = \ trace.h \ cJSON.h -EXTRA_DIST = uthash cJSON +EXTRA_DIST = uthash cJSON meson.build noinst_LTLIBRARIES = AM_CPPFLAGS = -I$(top_srcdir)/include diff --git a/tests/Makefile.am b/tests/Makefile.am index 57b1dfc..74bb8bc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,7 +43,8 @@ check_PROGRAMS = EXTRA_DIST = $(TESTS) \ glxenv.sh \ eglenv.sh \ - json + json \ + meson.build CFLAGS_COMMON = \ -I$(top_srcdir)/include \ diff --git a/tests/dummy/Makefile.am b/tests/dummy/Makefile.am index b7eb567..24afd73 100644 --- a/tests/dummy/Makefile.am +++ b/tests/dummy/Makefile.am @@ -4,7 +4,7 @@ noinst_HEADERS = \ EGL_dummy.h check_LTLIBRARIES = - + check_LTLIBRARIES += libpatchentrypoints.la libpatchentrypoints_la_CFLAGS = \ -I$(top_srcdir)/src/GLdispatch \ @@ -65,3 +65,5 @@ libEGL_dummy1_la_LIBADD = $(EGL_DUMMY_LIBADD_COMMON) libEGL_dummy1_la_LDFLAGS = $(EGL_DUMMY_LDFLAGS_COMMON) endif # ENABLE_EGL + +EXTRA_DIST = meson.build \ No newline at end of file