More changes to pacify C++ compilers.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b67e8e3a15a2b0146f9c94b2efa5d03f9e15c12..3c9e5695b848b443017389f190f0be971a988c6d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2001, 2002 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
@@ -12,31 +12,30 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-## 02111-1307  USA
-
-AUTOMAKE_OPTIONS = ../lib/ansi2knr
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301  USA
 
 DEFS = @DEFS@ \
   -DPKGDATADIR=\"$(pkgdatadir)\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
-CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
-YFLAGS = "-dv"
+AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
+AM_YFLAGS = "-dv"
 
-# libintl.h in is build/intl, intl/libgettext.h in src/,
-# config.h in build/.
-INCLUDES = -I$(top_builddir)/intl \
-           -I$(top_builddir)      \
-           -I$(top_srcdir)/intl \
-           -I$(top_srcdir)/lib
+LDADD = ../lib/libbison.a $(LIBINTL)
 
-LDADD = $(INTLLIBS) ../lib/libbison.a
+# Use our own Bison to build the parser.  Of course, you ought to
+# keep a sane version of Bison nearby...
+YACC = ../tests/bison -y
 
 bin_PROGRAMS = bison
+bin_SCRIPTS = $(YACC_SCRIPT)
+EXTRA_SCRIPTS = yacc
 
 bison_SOURCES =                                  \
        LR0.c LR0.h                               \
+       assoc.c assoc.h                           \
        closure.c closure.h                       \
        complain.c complain.h                     \
        conflicts.c conflicts.h                   \
@@ -62,15 +61,19 @@ bison_SOURCES =                               \
        symlist.c symlist.h                       \
        symtab.c symtab.h                         \
        system.h                                  \
-       types.h                                   \
+       tables.h tables.c                         \
+       uniqstr.c uniqstr.h                       \
        vcg.c vcg.h                               \
        vcg_defaults.h
 
 BUILT_SOURCES = scan-skel.c scan-gram.c parse-gram.c parse-gram.h
 
-EXTRA_bison_SOURCES = vmsgetargs.c
+MOSTLYCLEANFILES = yacc
 
-EXTRA_DIST = build.com bison.cld vmshlp.mar
+yacc:
+       echo '#! /bin/sh' >$@
+       echo 'exec $(bindir)/bison -y "$$@"' >>$@
+       chmod a+x $@
 
 echo:
        echo $(bison_SOURCES) $(noinst_HEADERS)