From 61c20254ec8c59b60639c5b64bc53d83cf73fd06 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Feb 05 2013 06:05:19 +0000 Subject: Use AM_MISSING_PROG instead of hardcoding missing --- diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 --- a/ChangeLog +++ /dev/null diff --git a/Makefile.am b/Makefile.am index 0da0e1a..0ae9346 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,18 +25,21 @@ MAINTAINERCLEANFILES = \ $(srcdir)/mkinstalldirs \ $(NULL) # -dist-hook: - @if test -d "$(srcdir)/.git"; \ - then \ - echo Creating ChangeLog && \ - ( cd "$(top_srcdir)" && \ - echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run git log --stat) > 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; \ +ChangeLog: $(srcdir)/ChangeLog +$(srcdir)/ChangeLog: + $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \ + (GIT_DIR=$(top_srcdir)/.git $(GIT) log --stat) | \ + fmt --split-only > $@.tmp \ + && mv -f $@.tmp $@ \ + || ($(RM) $@.tmp; \ + echo Failed to generate ChangeLog. your ChangeLog may be outdated >&2; \ + (test -f $@ || echo git-log is required to generate this file >> $@)); \ + else \ + test -f $@ || \ + (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ + echo A git checkout and git-log is required to generate this file >> $@); \ fi +.PHONY: $(srcdir)/ChangeLog + -include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac index 53457d3..55b7968 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ CXXFLAGS="$CXXFLAGS $WARN_CXXFLAGS" dnl ====================================================================== dnl define variables dnl ====================================================================== +AM_MISSING_PROG([GIT], [git]) dnl ====================================================================== dnl functions testing