From 2b3d2f4295a0752f8743d24c45e08d766ac6bc12 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 8 Nov 2013 23:19:51 +0100
Subject: Silence autofoo warning

---
 Makefile.am  | 2 ++
 configure.ac | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 14617a5..2d37078 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = 			\
 	mate-settings-daemon	\
 	plugins			\
diff --git a/configure.ac b/configure.ac
index f0adcd5..fc836f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,7 @@ AC_INIT([mate-settings-daemon],
 	[http://www.mate-desktop.org/])
 
 AC_CONFIG_SRCDIR([mate-settings-daemon/mate-settings-manager.c])
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar])
 
-- 
cgit v1.2.1


From 64106e463750c301ad6183fc87e0fc81037e9f9b Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 8 Nov 2013 23:36:13 +0100
Subject: INCLUDES -> AM_CPPFLAGS

---
 mate-settings-daemon/Makefile.am           | 3 ++-
 plugins/media-keys/cut-n-paste/Makefile.am | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mate-settings-daemon/Makefile.am b/mate-settings-daemon/Makefile.am
index 778cb92..7fb6fdc 100644
--- a/mate-settings-daemon/Makefile.am
+++ b/mate-settings-daemon/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DDATADIR=\""$(datadir)"\"				\
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-DLIBEXECDIR=\""$(libexecdir)"\" 			\
@@ -21,6 +21,7 @@ libmsd_profile_la_SOURCES =		\
 	$(NULL)
 
 libmsd_profile_la_CPPFLAGS = 		\
+	$(AM_CPPFLAGS)
 	$(DISABLE_DEPRECATED_CFLAGS)	\
 	$(NULL)
 
diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am
index 28a9f77..f5707da 100644
--- a/plugins/media-keys/cut-n-paste/Makefile.am
+++ b/plugins/media-keys/cut-n-paste/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 noinst_LTLIBRARIES = libgvc.la
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	$(WARN_CFLAGS)				\
 	$(NULL)
 
@@ -13,7 +13,7 @@ libgvc_la_SOURCES =			\
 	$(NULL)
 
 if HAVE_PULSE
-INCLUDES +=					\
+AM_CPPFLAGS +=					\
 	$(VOLUME_CONTROL_CFLAGS)		\
 	$(PULSE_CFLAGS)
 
@@ -43,7 +43,7 @@ libgvc_la_SOURCES +=		\
 endif
 
 if HAVE_GSTREAMER
-INCLUDES +=					\
+AM_CPPFLAGS +=					\
 	$(SETTINGS_PLUGIN_CFLAGS)		\
 	$(AM_CFLAGS)				\
 	$(GST_CFLAGS)
-- 
cgit v1.2.1


From d52a4ac5dada42cc49e11818da3a14e8253711a5 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 8 Nov 2013 23:37:16 +0100
Subject: Add dist-hook for auto Changelog generation

---
 Makefile.am | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 2d37078..2d42695 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,3 +16,17 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = \
 	$(NULL)
+
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		(GIT_DIR=$(top_srcdir)/.git \
+		 ./missing --run git log --stat -M -C --name-status --date=short --no-color) | \
+		 fmt --split-only > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
-- 
cgit v1.2.1