X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/56c47203421107ee019a20f3b56cfb967ad75bd2..f377f69fec28013c79db4efe12bbb9d48987fb2c:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c7100589..557cff7e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,14 +21,11 @@ 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 +34,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			  \
@@ -49,20 +47,20 @@ bison_SOURCES = 				  \
 	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			  \
+	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