Merge remote-tracking branch 'origin/maint'

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 37d2ce16efb7ffd73185de4b2f27781d3c034c2c..5fae4ce5848de9bf82f02b9518707a15eeda4c91 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
 BUILT_SOURCES =
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
 BUILT_SOURCES =

+CLEANFILES =

 DISTCLEANFILES =
 EXTRA_DIST += $(dist_TESTS)
 MOSTLYCLEANDIRS =
 DISTCLEANFILES =
 EXTRA_DIST += $(dist_TESTS)
 MOSTLYCLEANDIRS =


@@ -87,11 +88,13 @@ update-package-copyright-year:
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 gen-ChangeLog:

-       $(AM_V_GEN)if test -d .git; then                                \
-         $(top_srcdir)/build-aux/gitlog-to-changelog                   \
-           --no-cluster                                                \
-           --amend=$(srcdir)/build-aux/git-log-fix                     \
-           --since=$(gen_start_date) > $(distdir)/cl-t;                \
-         rm -f $(distdir)/ChangeLog;                                   \
-         mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
+       $(AM_V_GEN)if test -d $(srcdir)/.git; then              \
+         $(top_srcdir)/build-aux/gitlog-to-changelog           \
+           --strip-tab                                         \
+           --strip-cherry-picked                               \
+           --no-cluster                                        \
+           --amend=$(srcdir)/build-aux/git-log-fix             \
+           --since=$(gen_start_date) > $(distdir)/cl-t;        \
+         rm -f $(distdir)/ChangeLog;                           \
+         mv $(distdir)/cl-t $(distdir)/ChangeLog;              \

        fi
        fi