portability: fix several issues with M4 subprocess.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e55ad8b6836bee493df74a9eab2d0ba8b1a69a4b..095a42bed572185986a0fc16155f6514c5674b0c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,24 +1,21 @@
 # Make bison/src.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# 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 2, or (at your option)
-# any later version.
-
+# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/lib
 AM_YFLAGS = "-dv"
 
@@ -26,14 +23,17 @@ LDADD = ../lib/libbison.a $(LIBINTL)
 
 # Use our own Bison to build the parser.  Of course, you ought to
 # keep a sane version of Bison nearby...
-YACC = ../tests/bison -y --warnings=all,error
+YACC = ../tests/bison -y --warnings=all,error --report=all
 
 bin_PROGRAMS = bison
 bin_SCRIPTS = $(YACC_SCRIPT)
 EXTRA_SCRIPTS = yacc
 
 bison_SOURCES =                                          \
+       AnnotationList.c AnnotationList.h         \
+       InadequacyList.c InadequacyList.h         \
        LR0.c LR0.h                               \
+       Sbitset.c Sbitset.h                       \
        assoc.c assoc.h                           \
        closure.c closure.h                       \
        complain.c complain.h                     \
@@ -44,17 +44,19 @@ bison_SOURCES =                                       \
        getargs.c getargs.h                       \
        gram.c gram.h                             \
        lalr.h lalr.c                             \
+       ielr.h ielr.c                             \
        location.c location.h                     \
        main.c                                    \
-       muscle_tab.c muscle_tab.h                 \
+       muscle-tab.c muscle-tab.h                 \
+       named-ref.c named-ref.h                   \
        nullable.c nullable.h                     \
        output.c output.h                         \
        parse-gram.h parse-gram.y                 \
        print.c print.h                           \
        print_graph.c print_graph.h               \
+       print-xml.c print-xml.h                   \
        reader.c reader.h                         \
        reduce.c reduce.h                         \
-       revision.c revision.h                     \
        relation.c relation.h                     \
        scan-code.h scan-code-c.c                 \
        scan-gram.h scan-gram-c.c                 \
@@ -71,7 +73,6 @@ EXTRA_bison_SOURCES = scan-code.l scan-skel.l scan-gram.l
 
 BUILT_SOURCES =                                        \
 parse-gram.c parse-gram.h                      \
-revision.c                                     \
 scan-code.c                                    \
 scan-skel.c                                    \
 scan-gram.c
@@ -86,16 +87,6 @@ yacc:
 echo:
        echo $(bison_SOURCES) $(noinst_HEADERS)
 
-revision.c: $(top_srcdir)/configure $(top_srcdir)/ChangeLog
-       case "$(VERSION)" in \
-         *+*) sed -n \
-           's/^\$$\(Id.*\)\$$$$/const char *revision = "\1\\n";/p' \
-           $(top_srcdir)/ChangeLog \
-           ;; \
-         *) echo 'const char *revision = "";' \
-           ;; \
-       esac >$@
-
 # The following rule is not designed to be portable,
 # and relies on tools that not everyone has.