From: Tom Tromey <tromey@redhat.com>
Date: Sat, 25 Oct 1997 05:51:45 +0000 (+0000)
Subject: yaccflags fix
X-Git-Tag: Release-1-2d~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5fea197b0e373476b531bcd953cc16457e9262;p=thirdparty%2Fautomake.git

yaccflags fix
---

diff --git a/ChangeLog b/ChangeLog
index d9265f670..6790cfcc5 100644
--- 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 bf25e26f8..94734e62c 100644
--- 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 
 
 New in 1.2:
 * Bug fixes
diff --git a/automake.in b/automake.in
index 1f90cb4f9..08be6b8b1 100755
--- 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 ceec90269..5bcf3efd7 100644
--- 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.