From 627dfc2f836a3a1fc6afbd3f2335f88f5ca55ffd Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 22 Jan 2018 15:43:05 -0500 Subject: [PATCH] automake: Fix 'make distcheck' Add some missing meson.builds to the distball, and update the meson build test to work when the distcheck srcdir != builddir. The test build directory will be $(srcdir)/_distcheck_build so srcdir will need to be writable; this shouldn't be too much to ask I hope. Signed-off-by: Adam Jackson --- Makefile.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 55cdccba0..5ddfd5b84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,7 +130,12 @@ install-headers: Makefile done distcheck-hook: - rm -rf build && meson build && ninja -C build && rm -rf build + cd $(srcdir) && \ + meson setup _distcheck_build && \ + meson configure _distcheck_build && \ + ninja -C _distcheck_build && \ + rm -rf _distcheck_build && \ + cd - EXTRA_DIST += \ meson_options.txt \ @@ -182,6 +187,10 @@ EXTRA_DIST += \ hw/xnest/meson.build \ hw/xquartz/meson.build \ hw/xwayland/meson.build \ + hw/xwin/dri/meson.build \ + hw/xwin/glx/meson.build \ + hw/xwin/meson.build \ + hw/xwin/winclipboard/meson.build \ include/meson.build \ meson.build \ miext/damage/meson.build \ @@ -194,6 +203,9 @@ EXTRA_DIST += \ randr/meson.build \ record/meson.build \ render/meson.build \ + test/bigreq/meson.build \ + test/meson.build \ + test/sync/meson.build \ Xext/meson.build \ xfixes/meson.build \ Xi/meson.build \