X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7fb72c6e53f25f2d0b10fc9e0b412b8c7cde9101..087dcd78685097983821e5d540f9ff3385931833:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eaafcaac..eef413fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,8 +56,8 @@ dist-hook: gen-ChangeLog
 
 .PHONY: update-b4-copyright update-package-copyright-year
 update-b4-copyright:
-	$(AM_V_GEN)find data -type f                    \
-	  | grep -v -E '^data/bison.m4$$'    \
+	$(AM_V_GEN) find data -type f		\
+	  | grep -v -E '^data/bison.m4$$'	\
 	  | xargs $(build_aux)/$@
 	@echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
 update-package-copyright-year:
@@ -66,11 +66,13 @@ update-package-copyright-year:
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	$(AM_V_GEN)if test -d $(srcdir)/.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