* src/bison.simple (YYSTYPE, YYLTYPE): Move their definitions

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b757258ef6d0a1040f84d33864aaa555ba9b8b81..9ad2cc506fbfbe954be495ae518c528fb0a59ba8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,25 +5,33 @@ DEFS = @DEFS@ \
   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
-INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
-LDADD = @INTLLIBS@ ../lib/libbison.a
+# 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)/lib    \
+           -I$(top_srcdir)
+
+LDADD = $(INTLLIBS) ../lib/libbison.a
 
 bin_PROGRAMS = bison
 
 bison_SOURCES = LR0.c closure.c complain.c conflicts.c \
     derives.c  \
     files.c getargs.c gram.c lalr.c lex.c main.c nullable.c \
-    output.c   \
-    print.c reader.c reduce.c symtab.c warshall.c vcg.c print_graph.c
+    output.c print_graph.c \
+    muscle_tab.c options.c \
+    print.c reader.c reduce.c symtab.c warshall.c vcg.c
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
 noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
  derives.h \
  files.h getargs.h gram.h lalr.h lex.h nullable.h \
- output.h state.h      \
- print.h reader.h reduce.h symtab.h warshall.h system.h types.h \
- vcg.h vcg_defaults.h print_graph.h
+ output.h print_graph.h        \
+ muscle_tab.h options.h \
+ print.h reader.h reduce.h state.h symtab.h warshall.h system.h \
+ types.h vcg.h vcg_defaults.h
 
 pkgdata_DATA = bison.simple bison.hairy