X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4862bdfd613f96f4ab67326e6d64db3e654aec11..f805dfcb3fc6517dd0a49939fd6610999afcca00:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1a00d5c7..825266a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,38 +1,40 @@
-## 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, 2007, 2008, 2009
+# 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.
-
-## 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
-
-DEFS += -DPKGDATADIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(datadir)/locale\"
+# 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/>.
 
-AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+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 --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			  \
@@ -43,6 +45,7 @@ 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		  \
@@ -51,9 +54,9 @@ bison_SOURCES =					  \
 	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		  \
@@ -64,14 +67,12 @@ 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
 
 BUILT_SOURCES =					\
 parse-gram.c parse-gram.h			\
-revision.c					\
 scan-code.c					\
 scan-skel.c					\
 scan-gram.c
@@ -80,22 +81,12 @@ MOSTLYCLEANFILES = yacc
 
 yacc:
 	echo '#! /bin/sh' >$@
-	echo "exec '$(bindir)/bison' -y \"$$@\"" >>$@
+	echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
 	chmod a+x $@
 
 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.