skeletons: factor comments about symbols

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d29f852a6370285d339badd607f857a77662fe3b..a98611901aab7d267c0e6e54a61e932fcc27b145 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,19 @@
 ## Process this file with automake to produce Makefile.in.
 
 ## Process this file with automake to produce Makefile.in.
 

-## Copyright (C) 2001-2012 Free Software Foundation, Inc.
-
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4


@@ -33,18 +33,23 @@ EXTRA_DIST = .prev-version .version \
 BISON = $(top_builddir)/tests/bison
 BISON_IN = $(top_srcdir)/tests/bison.in
 YACC = $(BISON) -y
 BISON = $(top_builddir)/tests/bison
 BISON_IN = $(top_srcdir)/tests/bison.in
 YACC = $(BISON) -y

-AM_YFLAGS = -dv --warnings=all,error --report=all
+AM_YFLAGS = -d -v --warnings=all,error --report=all

 
 # Initialization before completion by local.mk's.
 AM_CFLAGS = $(WARN_CFLAGS)
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
 BUILT_SOURCES =
 
 # Initialization before completion by local.mk's.
 AM_CFLAGS = $(WARN_CFLAGS)
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
 BUILT_SOURCES =

+CLEANFILES =

 DISTCLEANFILES =
 DISTCLEANFILES =

+EXTRA_DIST += $(dist_TESTS)
+MOSTLYCLEANDIRS =

 MOSTLYCLEANFILES =
 SUFFIXES =
 MOSTLYCLEANFILES =
 SUFFIXES =

+TESTS = $(dist_TESTS)
+check_PROGRAMS =
+dist_TESTS =

 noinst_LIBRARIES =
 noinst_LIBRARIES =

-MOSTLYCLEANDIRS =

 
 include build-aux/local.mk
 include data/local.mk
 
 include build-aux/local.mk
 include data/local.mk


@@ -83,11 +88,15 @@ 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      \
+         cl=$(distdir)/ChangeLog &&                    \
+         rm -f $$cl.tmp &&                             \
+         $(top_srcdir)/build-aux/gitlog-to-changelog   \
+           --strip-tab                                 \
+           --strip-cherry-pick                         \
+           --no-cluster                                \
+           --amend=$(srcdir)/build-aux/git-log-fix     \
+           --srcdir=$(srcdir)                          \
+           --since=$(gen_start_date) > $$cl.tmp &&     \
+         mv -f $$cl.tmp $$cl;                          \

        fi
        fi