Replace INCLUDES with AM_CPPFLAGS, fixing a bug in src/Makefile.am

reported by Paul Hilfinger.

diff --git a/ChangeLog b/ChangeLog
index c0c758cdaaf3860aa21d9dc06fead86a90cf1a4c..5f0d4aee6eb2817894524511253f2b173e159648 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-02-02  Paul Eggert  <eggert@twinsun.com>
+
+       * src/Makefile.am (AM_CPPFLAGS): New macro.  It mentions
+       $(top_srcdir)/lib and ../lib.  This fixes a bug reported
+       by Paul Hilfinger; the old INCLUDES value didn't mention ../lib.
+       There's no need to mention top_builddir since Automake does that
+       for us.
+       (INCLUDES): Remove, as Automake says it's obsolescent.
+       Contents migrated into AM_CPPFLAGS as described above.
+       * lib/Makefile.am (INCLUDES): Remove; obsolescent.
+
+2004-01-14  Paul Hilfinger  <hilfingr@CS.Berkeley.EDU>
+
+       * data/glr.c (yytokenName): Bullet-proof against YYEMPTY token.
+       (yyreportSyntaxError): Handle case where lookahead token is
+       YYEMPTY.
+

 2004-01-13  Paul Hilfinger  <Hilfinger@CS.Berkeley.EDU>
 
        * data/glr.c: Put casts on uses of YYREALLOC and YYMALLOC so that
 2004-01-13  Paul Hilfinger  <Hilfinger@CS.Berkeley.EDU>
 
        * data/glr.c: Put casts on uses of YYREALLOC and YYMALLOC so that


@@ -17,7 +34,7 @@
        including it.
        * tests/Makefile.am ($(TESTSUITE)): Remove warning about ignoring
        multiple inclusion warnings.
        including it.
        * tests/Makefile.am ($(TESTSUITE)): Remove warning about ignoring
        multiple inclusion warnings.

-       
+

 2003-12-02  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo (How Can I Reset the Parser): More about start
 2003-12-02  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo (How Can I Reset the Parser): More about start


@@ -11789,7 +11806,7 @@
 -----
 
 Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
 -----
 
 Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,

-1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

 
 This file is part of Bison, the GNU Compiler Compiler.
 
 
 This file is part of Bison, the GNU Compiler Compiler.
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3ef271d7942d6d9e86c9f6441c1c52392e965922..1c9679d8ad827c3d72f29aa6083725db664c914e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004 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
 
 ## 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


@@ -21,11 +21,6 @@ lib_LIBRARIES = $(YACC_LIBRARY)
 EXTRA_LIBRARIES = liby.a
 noinst_LIBRARIES = libbison.a
 
 EXTRA_LIBRARIES = liby.a
 noinst_LIBRARIES = libbison.a
 

-# config.h is in build/., and system.h is in src/src/.
-INCLUDES = -I$(top_builddir)      \
-           -I$(top_srcdir)/src \
-           -I$(top_srcdir)/lib
-

 liby_a_SOURCES = main.c yyerror.c
 
 # Heck, we are still using an old version of Automake which does not
 liby_a_SOURCES = main.c yyerror.c
 
 # Heck, we are still using an old version of Automake which does not

diff --git a/src/Makefile.am b/src/Makefile.am
index 326b6c856a529ade5e032ecdd846f9fe7ed382e9..8f3483296836b9500e76b56a440c89cb1ccf4ab4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004 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
 
 ## 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


@@ -20,12 +20,9 @@ DEFS = @DEFS@ \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)

+AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib

 AM_YFLAGS = "-dv"
 
 AM_YFLAGS = "-dv"
 

-# config.h is in build/.
-INCLUDES = -I$(top_builddir)      \
-           -I$(top_srcdir)/lib
-

 LDADD = ../lib/libbison.a $(LIBINTL)
 
 # Use our own Bison to build the parser.  Of course, you ought to
 LDADD = ../lib/libbison.a $(LIBINTL)
 
 # Use our own Bison to build the parser.  Of course, you ought to