summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2009-11-18 12:20:53 +0000
committerEmmanuele Bassi <ebassi@linux.intel.com>2009-11-18 14:43:46 +0000
commit18e9d0db6fc9e120a63485d1ecbc8b5514d66c77 (patch)
tree4007709ed7a9cc7c1a92827bd1fb2c0376122138
parent142305b1d51e9a3c69e8e2e224480297e43f79ea (diff)
downloadclutter-18e9d0db6fc9e120a63485d1ecbc8b5514d66c77.tar.gz
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.
-rw-r--r--Makefile.am20
-rw-r--r--build/autotools/Makefile.am1
-rw-r--r--build/autotools/Makefile.am.changelog19
3 files changed, 21 insertions, 19 deletions
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