From 18e9d0db6fc9e120a63485d1ecbc8b5514d66c77 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed, 18 Nov 2009 12:20:53 +0000
Subject: [PATCH] build: Move ChangeLog rules in a separate file

The ChangeLog creation rules should be moved to their own file, to
make it easier to fix or change them in the future.
---
 Makefile.am                           | 20 +-------------------
 build/autotools/Makefile.am           |  1 +
 build/autotools/Makefile.am.changelog | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 build/autotools/Makefile.am.changelog

diff --git a/Makefile.am b/Makefile.am
index 3300b4fb0..63841f292 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/autotools/Makefile.am.silent
+include $(top_srcdir)/build/autotools/Makefile.am.changelog
 
 NULL =
 
@@ -60,22 +61,3 @@ MAINTAINERCLEANFILES = 	\
 	Makefile.in 	\
 	missing 	\
 	$(NULL)
-
-#PREV_RELEASE=$(CLUTTER_MAJOR_VERSION).$$(echo "$(CLUTTER_MINOR_VERSION)-1" | bc)
-PREV_RELEASE=git-import
-
-dist-hook:
-	@if test -d "$(srcdir)/.git"; \
-	then \
-		to=""; \
-		from="$(PREV_RELEASE)"; \
-		echo Creating ChangeLog && \
-		( cd "$(top_srcdir)" && \
-		  echo '# Generated by configure.  Do no edit.'; echo; \
-		  $(top_srcdir)/missing --run perl $(top_srcdir)/build/gen-changelog.pl $$from..$$to ) > ChangeLog.tmp \
-		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-		|| ( rm -f ChangeLog.tmp ; \
-		     echo Failed to generate ChangeLog >&2 ); \
-	else \
-		echo A git checkout is required to generate a ChangeLog >&2; \
-	fi
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index b510e22a6..bbdcf8955 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = \
 	Makefile.am.silent	\
 	Makefile.am.marshal	\
 	Makefile.am.enums	\
+	Makefile.am.changelog	\
 	dolt.m4			\
 	introspection.m4	\
 	gtk-doc.m4		\
diff --git a/build/autotools/Makefile.am.changelog b/build/autotools/Makefile.am.changelog
new file mode 100644
index 000000000..34a8f650a
--- /dev/null
+++ b/build/autotools/Makefile.am.changelog
@@ -0,0 +1,19 @@
+PREV_RELEASE=git-import
+
+changelog:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		to=""; \
+		from="$(PREV_RELEASE)"; \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generated by configure.  Do no edit.'; echo; \
+		  $(top_srcdir)/missing --run perl $(top_srcdir)/build/gen-changelog.pl $$from..$$to ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		     echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git checkout is required to generate a ChangeLog >&2; \
+	fi
+
+dist-hook: changelog