(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 8e745d8d6fe097a74a5f5a65550de1e2d40ba89a..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