X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/41d7a5f24d5e69bdf6ce10c012d50b89ce1e3957..08023564815cde92a29a76b616f7662a7146d98b:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f74c0b2..c2525b2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 # Make bison/src.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# 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
@@ -16,7 +15,7 @@
 # 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_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/lib
 AM_YFLAGS = "-dv"
 
@@ -24,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			  \
@@ -42,9 +44,11 @@ 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		  \
@@ -53,7 +57,6 @@ bison_SOURCES =					  \
 	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		  \
@@ -70,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
@@ -78,23 +80,13 @@ scan-gram.c
 MOSTLYCLEANFILES = yacc
 
 yacc:
-	echo '#! /bin/sh' >$@
-	echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
-	chmod a+x $@
+	$(AM_V_GEN)echo '#! /bin/sh' >$@
+	$(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
+	$(AM_V_at)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.