--- rpl/rplawk/Makefile.am	2010/09/07 13:38:55	1.2
+++ rpl/rplawk/Makefile.am	2011/10/03 15:57:52	1.4
@@ -1,30 +1,31 @@
 EXTRA_DIST = awkgram.y awk.h b.c lex.c lib.c main.c maketab.c parse.c \
 		proto.h run.c tran.c y.tab.c y.tab.h
 
-#y.tab.c y.tab.h: awkgram.y
-#	yacc -d $<
+y.tab.c y.tab.h: awkgram.y
+	yacc -d $<
 
-ytab.c: y.tab.c
+$(top_builddir)/rplawk/ytab.c: y.tab.c
 	cp -f $< $@
 
-ytab.h: y.tab.h
+$(top_builddir)/rplawk/ytab.h: y.tab.h
 	cp -f $< $@
 
-maketab: maketab.c ytab.h
+maketab$(EXEEXT): maketab.c $(top_builddir)/rplawk/ytab.h
 	$(CC) $(CFLAGS) -I. -o $@ $<
 
-proctab.c: maketab
+proctab.c: @RPLTOOLS@/rplawk/maketab$(EXEEXT) $(top_builddir)/rplawk/ytab.h
 	./$< > $@
 
-%.$(OBJEXT): %.c ytab.h
+%.$(OBJEXT): %.c $(top_builddir)/rplawk/ytab.h
 	$(CC) $(CFLAGS) -c -o $@ $< -I$(srcdir) -I.
 
-rplawk: ytab.$(OBJEXT) b.$(OBJEXT) main.$(OBJEXT) parse.$(OBJEXT) \
-		proctab.$(OBJEXT) tran.$(OBJEXT) lib.$(OBJEXT) run.$(OBJEXT) lex.$(OBJEXT)
+rplawk$(EXEEXT): ytab.$(OBJEXT) b.$(OBJEXT) main.$(OBJEXT) parse.$(OBJEXT) \
+		proctab.$(OBJEXT) tran.$(OBJEXT) lib.$(OBJEXT) run.$(OBJEXT) \
+		lex.$(OBJEXT)
 	$(CC) $(LDFLAGS) -o $@ $+ -lm
 
 clean:
-	rm -f *.o ytab.c ytab.h maketab rplawk proctab.c
+	rm -f *.o ytab.c ytab.h maketab$(EXEEXT) rplawk$(EXEEXT) proctab.c
 
-bin_PROGRAMS = rplawk
+bin_PROGRAMS = rplawk$(EXEEXT)
 nodist_rplawk_SOURCES = rplawk.c