* src/derives.h: New file.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f5ba8dd13f7fa005e837f162ff53b12c6296222..e7598e7bba624e40692766d0328a29d5de280336 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,24 +1,26 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.4 ansi2knr
-
-bin_PROGRAMS = bison
-
-bison_SOURCES = LR0.c allocate.c closure.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 getopt.c getopt1.c
-
-EXTRA_bison_SOURCES = vmsgetargs.c
-
-bison_LDADD = @INTLLIBS@ @ALLOCA@
+AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
 
 DEFS = @DEFS@ \
   -DXPFILE=\"${datadir}/bison.simple\" \
   -DXPFILE1=\"${datadir}/bison.hairy\" \
   -DLOCALEDIR=\"${datadir}/locale\"
-INCLUDES = -I../intl -I$(top_srcdir)/intl -I..
+INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
+LDADD = @INTLLIBS@ ../lib/libbison.a
+
+bin_PROGRAMS = bison
+
+bison_SOURCES = LR0.c allocate.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
+
+EXTRA_bison_SOURCES = vmsgetargs.c
 
-noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h        \
- symtab.h system.h types.h getopt.h
+noinst_HEADERS = alloc.h complain.h files.h getargs.h gram.h lex.h \
+ derives.h state.h     \
+ symtab.h system.h types.h
 
 data_DATA = bison.simple bison.hairy
 
@@ -27,7 +29,7 @@ EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar
 bison.simple: bison.s1 Makefile
        sed -e "s/@bison_version@/$(VERSION)/" $(srcdir)/bison.s1 | \
        awk '\
-       /^#line/ { printf "\"#line %d $(datadir)/bison.simple\"\n", NR+1; next }\
+       /^#line/ { printf "#line %d \"$(datadir)/bison.simple\"\n", NR+1; next }\
        { print }' >$@t
        mv $@t $@