Re: FYI: help Automake reading Yacc flags

[Akim Demaille]

Le 15 févr. 2012 à 17:27, Akim Demaille a écrit :

> 
> Le 15 févr. 2012 à 13:09, Akim Demaille a écrit :
> 
>> I installed this in master.
>> 
>> From 505b107f9de76ded4470a6335a64339810a4dc54 Mon Sep 17 00:00:00 2001
>> From: Akim Demaille <address@hidden>
>> Date: Wed, 15 Feb 2012 12:53:34 +0100
>> Subject: [PATCH] maint: help Automake reading Yacc flags.
>> 
>>       * Makefile.am (AM_YFLAGS): Automake looks for "-d" alone.
> 
> I also installed the following, since it was needed only because
> we failed to define AM_YFLAGS properly.
> 
> From 3d6ca339083c278d907c9f030f4ba6bc5ecb07f2 Mon Sep 17 00:00:00 2001
> From: Akim Demaille <address@hidden>
> Date: Wed, 15 Feb 2012 13:32:07 +0100
> Subject: maint: trust Automake for parser headers.

This is the version installed in branch-2.5.

From 3f3e78dc8926b0e30fef77e5227c634e12bff2b9 Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Wed, 15 Feb 2012 13:36:24 +0100
Subject: [PATCH] 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.
---
 src/Makefile.am |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index d51cea6..511b905 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                       \
-- 
1.7.9