[cairo-commit] 2 commits - Makefile.am

[GitLab Mirror]

 Makefile.am |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 359afa3e88883082b615f36734cadb4800c5aa82
Merge: ad3bace25 93f13ced8
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Mar 20 17:32:42 2022 +0000

    Merge branch 'meson-fixes' into 'master'
    
    autotools: Dist some files required for meson
    
    See merge request cairo/cairo!303

commit 93f13ced8596e438a5ee8547105e8f80c857faac
Author: David King <amigadave at amigadave.com>
Date:   Sun Mar 20 16:37:49 2022 +0000

    autotools: Dist some files required for meson
    
    https://gitlab.freedesktop.org/cairo/cairo/-/issues/547

diff --git a/Makefile.am b/Makefile.am
index 12cd9bf25..8eb394ee5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,8 @@ EXTRA_DIST += \
 	version.py \
 	boilerplate/make-cairo-boilerplate-constructors.py \
 	boilerplate/meson.build \
+	doc/public/meson.build \
+	doc/public/version.xml.in \
 	src/meson.build \
 	test/make-cairo-test-constructors.py \
 	test/meson.build \
@@ -71,13 +73,14 @@ EXTRA_DIST += \
 	util/cairo-trace/meson.build \
 	util/meson.build \
 	meson-cc-tests/atomic-ops-cxx11.c \
+	meson-cc-tests/atomic-ops-gcc-legacy.c \
 	meson-cc-tests/bfd-section-flags.c \
-	meson-cc-tests/ipc_rmid_deferred_release.c \
+	meson-cc-tests/check-unused-result.c \
 	meson-cc-tests/ft_has_color.c \
+	meson-cc-tests/ipc_rmid_deferred_release.c \
 	meson-cc-tests/mkdir-variant-1.c \
-	meson-cc-tests/pthread.c \
-	meson-cc-tests/atomic-ops-gcc-legacy.c \
 	meson-cc-tests/mkdir-variant-2.c \
+	meson-cc-tests/pthread.c \
 	subprojects/expat.wrap \
 	subprojects/fontconfig.wrap \
 	subprojects/freetype2.wrap \