More changes to pacify C++ compilers.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 416e216cee71f4339244fa77a21ca0e446b545be..3c9e5695b848b443017389f190f0be971a988c6d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright 2001 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,51 +12,68 @@
 
 ## 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@ \
-  -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
-  -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
+  -DPKGDATADIR=\"$(pkgdatadir)\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
-CFLAGS = @CFLAGS@ $(WARNING_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 closure.c complain.c conflicts.c \
-    derives.c  \
-    files.c getargs.c gram.c lalr.c lex.c main.c nullable.c \
-    output.h output.c \
-    state.h state.c \
-    print_graph.h print_graph.c \
-    muscle_tab.h muscle_tab.c \
-    options.h options.c \
-    print.c reader.c reduce.c symtab.c warshall.c vcg.c \
-    skeleton.h parse-skel.h parse-skel.y scan-skel.l
-
-BUILT_SOURCES = parse-skel.c scan-skel.c
+bison_SOURCES =                                  \
+       LR0.c LR0.h                               \
+       assoc.c assoc.h                           \
+       closure.c closure.h                       \
+       complain.c complain.h                     \
+       conflicts.c conflicts.h                   \
+       derives.c derives.h                       \
+       files.c files.h                           \
+       getargs.c getargs.h                       \
+       gram.c gram.h                             \
+       lalr.h lalr.c                             \
+       location.c location.h                     \
+       main.c                                    \
+       muscle_tab.c muscle_tab.h                 \
+       nullable.c nullable.h                     \
+       output.c output.h                         \
+       parse-gram.h parse-gram.y                 \
+       print.c print.h                           \
+       print_graph.c print_graph.h               \
+       reader.c reader.h                         \
+       reduce.c reduce.h                         \
+       relation.c relation.h                     \
+       scan-gram.l                               \
+       scan-skel.l                               \
+       state.c state.h                           \
+       symlist.c symlist.h                       \
+       symtab.c symtab.h                         \
+       system.h                                  \
+       tables.h tables.c                         \
+       uniqstr.c uniqstr.h                       \
+       vcg.c vcg.h                               \
+       vcg_defaults.h
 
-EXTRA_bison_SOURCES = vmsgetargs.c
+BUILT_SOURCES = scan-skel.c scan-gram.c parse-gram.c parse-gram.h
 
-noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
- derives.h \
- files.h getargs.h gram.h lalr.h lex.h nullable.h \
- print.h reader.h reduce.h symtab.h warshall.h system.h \
- types.h vcg.h vcg_defaults.h
+MOSTLYCLEANFILES = yacc
 
-pkgdata_DATA = bison.simple bison.hairy
+yacc:
+       echo '#! /bin/sh' >$@
+       echo 'exec $(bindir)/bison -y "$$@"' >>$@
+       chmod a+x $@
 
-EXTRA_DIST = $(pkgdata_DATA) build.com bison.cld vmshlp.mar
+echo:
+       echo $(bison_SOURCES) $(noinst_HEADERS)