Update.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 481581534f1fbd6377db59e5030341a0ab4e4254..f138f819872fd63f5669920fa77145787d32025e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,11 +24,8 @@ DEFS = @DEFS@ \
 CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 YFLAGS = "-dv"
 
 CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 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
            -I$(top_srcdir)/lib
 
 LDADD = $(INTLLIBS) ../lib/libbison.a


@@ -37,6 +34,7 @@ bin_PROGRAMS = bison
 
 bison_SOURCES =                                  \
        LR0.c LR0.h                               \
 
 bison_SOURCES =                                  \
        LR0.c LR0.h                               \

+       assoc.c assoc.h                           \

        closure.c closure.h                       \
        complain.c complain.h                     \
        conflicts.c conflicts.h                   \
        closure.c closure.h                       \
        complain.c complain.h                     \
        conflicts.c conflicts.h                   \


@@ -49,19 +47,20 @@ bison_SOURCES =                               \
        main.c                                    \
        muscle_tab.c muscle_tab.h                 \
        nullable.c nullable.h                     \
        main.c                                    \
        muscle_tab.c muscle_tab.h                 \
        nullable.c nullable.h                     \

-       options.c options.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                         \
        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                           \
        scan-gram.l                               \
        scan-skel.l                               \
        state.c state.h                           \

+       symlist.c symlist.h                       \

        symtab.c symtab.h                         \
        system.h                                  \
        symtab.c symtab.h                         \
        system.h                                  \

-       types.h                                   \
+       tables.h tables.c                         \

        vcg.c vcg.h                               \
        vcg_defaults.h
 
        vcg.c vcg.h                               \
        vcg_defaults.h