From: John Marshall Date: Sat, 13 Apr 2019 13:21:52 +0000 (+0100) Subject: build: add meson build files to EXTRA_DIST to include in autotools make dist X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~11^2~136 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f465c08ccc5aba7316e08d230ed33bec575807f1;p=babl.git build: add meson build files to EXTRA_DIST to include in autotools make dist --- diff --git a/Makefile.am b/Makefile.am index 4e6cdda..3859aff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,9 @@ EXTRA_DIST = \ TODO \ autogen.sh \ babl.pc.in \ - export-symbols + export-symbols \ + meson_options.txt \ + meson.build DISTCLEANFILES = \ $(built_dist_files) \ diff --git a/babl/Makefile.am b/babl/Makefile.am index 75345f2..2cae03d 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -106,7 +106,9 @@ libbabl_@BABL_API_VERSION@_la_LDFLAGS= \ -export-symbols $(top_srcdir)/export-symbols \ -version-info $(BABL_LIBRARY_VERSION) -EXTRA_DIST = babl-ref-pixels.inc +EXTRA_DIST = \ + babl-ref-pixels.inc \ + meson.build # If git is available, always check if git-version.h should be diff --git a/babl/base/Makefile.am b/babl/base/Makefile.am index 1199462..d9d422e 100644 --- a/babl/base/Makefile.am +++ b/babl/base/Makefile.am @@ -25,5 +25,6 @@ libbase_la_LIBADD = $(MATH_LIB) EXTRA_DIST = \ util.h \ - pow-24.h + pow-24.h \ + meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index e612c7c..07d8305 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -21,7 +21,8 @@ EXTRA_DIST= \ tools/changelog2rss \ index-static.html.in \ COPYING \ - COPYING.LESSER + COPYING.LESSER \ + meson.build BUILT_EXTRA_DIST = index.html diff --git a/docs/graphics/Makefile.am b/docs/graphics/Makefile.am index f201be6..dbc46d1 100644 --- a/docs/graphics/Makefile.am +++ b/docs/graphics/Makefile.am @@ -15,7 +15,8 @@ SVG_FILES = \ EXTRA_DIST = \ index.html \ $(PNG_FILES) \ - $(SVG_FILES) + $(SVG_FILES) \ + meson.build MAINTAINERCLEANFILES = $(PNG_FILES) diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 82ff661..9a1f66e 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -78,3 +78,6 @@ sse2_int8_la_CFLAGS = $(SSE2_EXTRA_CFLAGS) sse2_int16_la_CFLAGS = $(SSE2_EXTRA_CFLAGS) sse4_int8_la_CFLAGS = $(SSE4_1_EXTRA_CFLAGS) sse_half_la_CFLAGS = $(SSE4_1_EXTRA_CFLAGS) $(F16C_EXTRA_CFLAGS) + +EXTRA_DIST = \ + meson.build \ No newline at end of file diff --git a/tests/Makefile.am b/tests/Makefile.am index 8c5abb7..a1ccf0c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,7 +41,9 @@ AM_LDFLAGS = $(THREAD_LIB) -no-install LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(MATH_LIB) $(THREAD_LIB) -EXTRA_DIST=common.inc +EXTRA_DIST = \ + common.inc \ + meson.build noinst_PROGRAMS = \ $(C_TESTS) diff --git a/tools/Makefile.am b/tools/Makefile.am index 00174f2..fb35837 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,3 +19,6 @@ if HAVE_SRANDOM noinst_PROGRAMS += \ babl-gen-test-pixels endif + +EXTRA_DIST = \ + meson.build \ No newline at end of file