Don't use m4_divert since it makes m4_divert_push and m4_divert_pop

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7f3369227bc9ebd4ef8f95853949e1a074987ef4..2592256b803c6c1716f335a1d3b4078d960538a9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,32 @@
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Make bison/src.
 
-## 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 of the License, or
-## (at your option) any later version.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 
-## 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.
+# 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.
 
-## 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
+# 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.
 
-DEFS += -DPKGDATADIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(datadir)/locale\"
+# 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.
 
 AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
+AM_CPPFLAGS = -I$(top_srcdir)/lib
 AM_YFLAGS = "-dv"
 
 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
+YACC = ../tests/bison -y --warnings=all,error
 
 bin_PROGRAMS = bison
 bin_SCRIPTS = $(YACC_SCRIPT)
@@ -64,8 +65,7 @@ bison_SOURCES =                                         \
        system.h                                  \
        tables.h tables.c                         \
        uniqstr.c uniqstr.h                       \
-       vcg.c vcg.h                               \
-       vcg_defaults.h
+       graphviz.c graphviz.h
 
 EXTRA_bison_SOURCES = scan-code.l scan-skel.l scan-gram.l
 
@@ -74,7 +74,7 @@ parse-gram.c parse-gram.h                     \
 revision.c                                     \
 scan-code.c                                    \
 scan-skel.c                                    \
-scan-gram.c                                    \
+scan-gram.c
 
 MOSTLYCLEANFILES = yacc