[Automake-commit] [SCM] GNU Automake branch, msvc, updated. v1.11-636-g4f3e5b5

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=4f3e5b5c883fb2cf867e9d7734690a283a1165ee

The branch, msvc has been updated
       via  4f3e5b5c883fb2cf867e9d7734690a283a1165ee (commit)
       via  e6fa05e7c7df67117138bf131e1599b346213bd0 (commit)
      from  da14dc7d8a597bf0960cc565f16b728955f4ebe4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f3e5b5c883fb2cf867e9d7734690a283a1165ee
Merge: da14dc7 e6fa05e
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 28 11:47:20 2011 +0100

    Merge branch 'maint' into msvc
    
    * maint:
      maint: autogenerate ChangeLog

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                |    1 +
 ChangeLog => ChangeLog.11 |    0
 Makefile.am               |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 0 deletions(-)
 rename ChangeLog => ChangeLog.11 (100%)

diff --git a/.gitignore b/.gitignore
index 4782321..33e3827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 Makefile.in
 Makefile
+/ChangeLog
 /aclocal.m4
 /configure
 /autom4te.cache
diff --git a/ChangeLog b/ChangeLog.11
similarity index 100%
rename from ChangeLog
rename to ChangeLog.11
diff --git a/Makefile.am b/Makefile.am
index acb7228..ed01bbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ EXTRA_DIST = \
   ChangeLog.03 \
   ChangeLog.04 \
   ChangeLog.09 \
+  ChangeLog.11 \
   bootstrap \
   $(AUTOMAKESOURCES)
 
@@ -108,6 +109,43 @@ INSTALL: lib/INSTALL
 ## to anybody else
 ##
 
+gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
+gitlog_to_changelog_options = --since='2011-12-28 00:00:00'
+
+# Automatic generation of the ChangeLog from git history.
+#
+# When executed from a git checkout, generate the ChangeLog from the git
+# history.  When executed from an extracted distribution tarball, just
+# copy the distributed ChangeLog in the build directory (and if this
+# fails, or if no distributed ChangeLog file is present, complain and
+# give an error).
+#
+# We need the apparently useless dependency from another .PHONY target
+# `am--changelog-regen-hook' to work around a bug of Solaris make, which
+# doesn't execute the recipe of a target named as an existing file, even
+# if such target is declared `.PHONY' (yikes!)
+#
+.PHONY: am--changelog-regen-hook
+am--changelog-regen-hook:
+ChangeLog: am--changelog-regen-hook
+       $(AM_V_GEN)set -e; set -u; \
+## The ChangeLog should be regenerated unconditionally when working from
+## checked-out sources; otherwise, if we're working from a distribution
+## tarball, we expect the ChangeLog to be distributed, so check that it
+## is indeed present in the source directory.
+       if test -d $(srcdir)/.git; then \
+         rm -f address@hidden \
+           && $(gitlog_to_changelog_command) \
+              $(gitlog_to_changelog_options) >address@hidden \
+           && chmod a-w address@hidden \
+           && mv -f address@hidden $@ \
+           || exit 1; \
+       elif test ! -f $(srcdir)/$@; then \
+         echo "Source tree is not a git checkout, and no pre-existent" \
+              "$@ file has been found there" >&2; \
+         exit 1; \
+       fi
+
 # Ensure tests are world-executable
 dist-hook:
        cd $(distdir)/tests && chmod a+rx *.test


hooks/post-receive
-- 
GNU Automake