Fix how lex and yacc are handled.

svn path=/trunk/yasm/; revision=70

diff --git a/src/Makefile.am b/src/Makefile.am
index f7333354dbc6555240ff66ae6db0897618170c67..0415ff70d950e6350697a216321300fbcab14eaa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,8 @@
 bin_PROGRAMS = yasm
 
-INCLUDES = -I$(top_srcdir)/include
-
 yasm_SOURCES = \
-       lex.yy.c                \
-       bison.tab.c             \
+       bison.y                 \
+       token.l                 \
        bytecode.c              \
        errwarn.c               \
        main.c                  \
@@ -12,24 +10,13 @@ yasm_SOURCES = \
 
 noinst_SCRIPTS = gen_instr.pl
 
-# yes, generate it locally.
-bison.tab.c: bison.y
-       $(YACC) -d -t $(srcdir)/$< -o $@
-       mv bison.tab.h $(top_srcdir)/include/
-
-# yes, generate it locally.
-lex.yy.c: token.l
-       $(LEX) -o$@ $(srcdir)/$<
+AM_YFLAGS = -d
 
 token.l bison.y: instrs.dat token.l.in bison.y.in gen_instr.pl
        $(PERL) $(srcdir)/gen_instr.pl -i $(srcdir)/instrs.dat -t $(srcdir)/token.l -g $(srcdir)/bison.y
 
-BUILT_SOURCES = token.l bison.y lex.yy.c bison.tab.c
+BUILT_SOURCES = token.l bison.y
 
 EXTRA_DIST = \
        instrs.dat              \
-       gen_instr.pl            \
-       token.l.in              \
-       lex.yy.c                \
-       bison.y.in              \
-       bison.tab.c
+       gen_instr.pl