From: Akim Demaille <demaille@gostai.com>
Date: Wed, 15 Feb 2012 12:36:24 +0000 (+0100)
Subject: maint: rely on Automake for parsers.
X-Git-Tag: v2.5.1_rc2~106
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/3f3e78dc8926b0e30fef77e5227c634e12bff2b9

maint: rely on Automake for parsers.

	* Makefile.am (AM_YFLAGS): Automake looks for "-d" alone.
	Move other options in here.
	(BISON): New.
	(YACC): Use it.
	(bison_SOURCES): Now that automake can see `-d' in AM_YFLAGS,
	we can rely on it to compile and ship the parser header
	files.

Based on commit 737406a32c201471699bfa0843d1f432f3ec29ab and
commit 3d6ca339083c278d907c9f030f4ba6bc5ecb07f2.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index d51cea62..511b9058 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,13 +17,13 @@
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/lib
-AM_YFLAGS = "-dv"
-
-LDADD = ../lib/libbison.a $(LIBINTL)
-
+BISON = ../tests/bison
 # 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 --report=all
+YACC = $(BISON) -y
+AM_YFLAGS = -d -v --warnings=all,error --report=all
+
+LDADD = ../lib/libbison.a $(LIBINTL)
 
 bin_PROGRAMS = bison
 bin_SCRIPTS = $(YACC_SCRIPT)
@@ -51,7 +51,7 @@ bison_SOURCES =                                 \
   named-ref.c named-ref.h                       \
   nullable.c nullable.h                         \
   output.c output.h                             \
-  parse-gram.h parse-gram.y                     \
+  parse-gram.y                                  \
   print.c print.h                               \
   print_graph.c print_graph.h                   \
   print-xml.c print-xml.h                       \