Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 04:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
reported by Paul Hilfinger.
This commit is contained in:
Paul Eggert
2004-02-02 22:36:49 +00:00
parent d0d5aa6425
commit dd0e0635ec
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@@ -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
@@ -11789,7 +11806,7 @@
-----
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.

7
lib/Makefile.am
View File

@@ -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
@@ -21,11 +21,6 @@ lib_LIBRARIES = $(YACC_LIBRARY)
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

7
src/Makefile.am
View File

@@ -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
@@ -20,12 +20,9 @@ DEFS = @DEFS@ \
-DLOCALEDIR=\"$(datadir)/locale\"
AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
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