(struct goto_list): Renamed from struct goto_list_s.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b67e8e3a15a2b0146f9c94b2efa5d03f9e15c12..44b7c13fe6b122c65fdc9575ff8a20ad2ce299ef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,28 +15,24 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA
 
-AUTOMAKE_OPTIONS = ../lib/ansi2knr
-
 DEFS = @DEFS@ \
   -DPKGDATADIR=\"$(pkgdatadir)\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
-CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
-YFLAGS = "-dv"
+AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
+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 \
+# config.h is in build/.
+INCLUDES = -I$(top_builddir)      \
            -I$(top_srcdir)/lib
 
-LDADD = $(INTLLIBS) ../lib/libbison.a
+LDADD = ../lib/libbison.a $(LIBINTL)
 
 bin_PROGRAMS = bison
 
 bison_SOURCES =                                  \
        LR0.c LR0.h                               \
+       assoc.c assoc.h                           \
        closure.c closure.h                       \
        complain.c complain.h                     \
        conflicts.c conflicts.h                   \
@@ -62,15 +58,12 @@ 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
-
-EXTRA_DIST = build.com bison.cld vmshlp.mar
-
 echo:
        echo $(bison_SOURCES) $(noinst_HEADERS)