(main): With --trace=time, report times even if a non-fatal error

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index fabfdf0a1fb0cf192d00e0664ea2bf8cceaf0a1f..7a388a06f90462147db1537995fd328a3863040c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,20 +15,15 @@
 ## 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
@@ -37,6 +32,7 @@ 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                   \
@@ -55,13 +51,14 @@ bison_SOURCES =                               \
        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                                  \
-       types.h                                   \
+       tables.h tables.c                         \
        vcg.c vcg.h                               \
        vcg_defaults.h