pixman: Branch 'master' - 2 commits

[GitLab Mirror]

 .editorconfig      |    3 +++
 Makefile.am        |    5 ++++-
 demos/Makefile.am  |    7 ++++++-
 pixman/Makefile.am |    1 +
 test/Makefile.am   |    4 ++++
 5 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit b40d5495ece2b2b5cff60e386c2f69db4ae03916
Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Nov 29 13:48:22 2018 -0800

    build: Add meson files to EXTRA_DIST
    
    Reviewed-by: Matt Turner <mattst88 at gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 593cbcf..a680665 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,10 @@ RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org, xorg-announce at lists.fr
 
 EXTRA_DIST =				\
 	Makefile.win32			\
-	Makefile.win32.common
+	Makefile.win32.common		\
+	meson.build			\
+	meson_options.txt		\
+	$(NULL)
 
 tar_gz = $(PACKAGE)-$(VERSION).tar.gz
 tar_bz2 = $(PACKAGE)-$(VERSION).tar.bz2
diff --git a/demos/Makefile.am b/demos/Makefile.am
index e04743d..44a5553 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,4 +1,9 @@
-EXTRA_DIST = parrot.c parrot.jpg scale.ui
+EXTRA_DIST =		\
+     parrot.c		\
+     parrot.jpg		\
+     scale.ui		\
+     meson.build	\
+     $(NULL)
 
 if HAVE_GTK
 
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 581b6f6..3de2615 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST =				\
 	Makefile.win32			\
 	pixman-region.c			\
 	solaris-hwcap.mapfile		\
+	meson.build			\
 	$(NULL)
 
 # mmx code
diff --git a/test/Makefile.am b/test/Makefile.am
index 88dc36d..6dbed88 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,3 +11,7 @@ noinst_LTLIBRARIES = libutils.la
 noinst_PROGRAMS = $(TESTPROGRAMS) $(OTHERPROGRAMS)
 
 TESTS = $(TESTPROGRAMS)
+
+EXTRA_DIST =			\
+	meson.build		\
+	$(NULL)
commit 16eacf19a3de60b145f3d6ef1f96df7a36e5d7fc
Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Nov 29 13:48:12 2018 -0800

    editorconfig: use tabs for Makefiles
    
    Reviewed-by: Matt Turner <mattst88 at gmail.com>

diff --git a/.editorconfig b/.editorconfig
index 5153bb0..b98bc65 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,9 @@ root = true
 [*]
 tab_width = 8
 
+[Makefile.*]
+indent_style = tab
+
 [meson.build,meson_options.txt]
 indent_style = space
 indent_size = 2