yaccflags fix

diff --git a/ChangeLog b/ChangeLog
index d9265f6707c2dd6d5ad02e44db81c2bb7f1fa353..6790cfcc5a67ab41bf6a82e9774748848129641f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 23:15:09 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (output_yacc_build_rule): Use YFLAGS again.
+       (handle_yacc_lex_cxx): Error if YACCFLAGS used.
+
 Wed Aug 27 19:26:45 1997  Rob Savoye  <rob@chinadoll.cygnus.com>
 
        * compile.am: Add suffix rules for ".s.o" and ".S.o" so assembler

diff --git a/NEWS b/NEWS
index bf25e26f81ea69c4c8434d9e905ebe2d3b835d9a..94734e62c569b2a21109abf8fd3b659ef607c7a4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ New in 1.2c:
 * @LEXLIB@ no longer required when lex source seen
 * Built-in support for assembly
 * aclocal gives error if `AM_' macro not found
+* Passed YFLAGS, not YACCFLAGS, to yacc 
 \f
 New in 1.2:
 * Bug fixes

diff --git a/automake.in b/automake.in
index 1f90cb4f9e7a8ec4a8633276fea230088cbdf033..08be6b8b128c0d6b6107a4845684ea24569bec42 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -841,6 +841,11 @@ sub handle_yacc_lex_cxx
        {
            &am_error ("yacc source seen but \`YACC' not defined in \`configure.in'");
        }
+       if (&variable_defined ('YACCFLAGS'))
+       {
+           &am_line_error ('YACCFLAGS',
+                           "\`YACCFLAGS' obsolete; use \`YFLAGS' instead");
+       }
     }
     if ($lex_count)
     {
@@ -997,11 +1002,11 @@ sub output_yacc_build_rule
        {
            $output_rules .= ('$(SHELL) $(YLWRAP)'
                              . ' "$(YACC)" $< y.tab.c $*' . $c_suffix
-                             . ' y.tab.h $*.h -- $(YACCFLAGS)');
+                             . ' y.tab.h $*.h -- $(YFLAGS)');
        }
        else
        {
-           $output_rules .= ('$(YACC) $(YACCFLAGS) $< && mv y.tab.c $@' . "\n"
+           $output_rules .= ('$(YACC) $(YFLAGS) $< && mv y.tab.c $@' . "\n"
                              . "\tif test -f y.tab.h; then \\\n"
                              . "\tif cmp -s y.tab.h \$*.h; then rm -f y.tab.h; else mv y.tab.h \$*.h; fi; \\\n"
                          . "\telse :; fi");

diff --git a/automake.texi b/automake.texi
index ceec90269f7514b5fdc2986276f66016a1e4ee4f..5bcf3efd792ddc761e26433c1038f5d5d42cf01a 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1541,10 +1541,6 @@ do this.  Automake's lex support also requires that you use the
 @samp{AC_DECL_YYTEXT} macro---automake needs to know the value of
 @samp{LEX_OUTPUT_ROOT}.
 
-Any program including a lex source file must be linked against
-@samp{@@LEXLIB@@}.  You can do this by putting @samp{@@LEXLIB@@} into
-the appropriate @samp{LDADD} variable.
-
 Automake makes it possible to include multiple yacc (or lex) source
 files in a single program.  Automake uses a small program called
 @code{ylwrap} to run @code{yacc} (or @code{lex}) in a subdirectory.