Build parser and lexer into the source directory. Other cosmetic

things.

diff --git a/src/Makefile.am b/src/Makefile.am
index e8068ef..e078057 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with `automake' to generate `Makefile.in'
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.3 1997/08/07 09:39:36 mdw Exp $
+## $Id: Makefile.am,v 1.4 1997/08/20 16:14:12 mdw Exp $
 ##
 ## Makefile for `become'
 ##
@@ -29,6 +29,10 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.4  1997/08/20 16:14:12  mdw
+## Build parser and lexer into the source directory.  Other cosmetic
+## things.
+##
 ## Revision 1.3  1997/08/07 09:39:36  mdw
 ## Add new source files, and remove options inappropriate for subsidiary
 ## Makefiles.
@@ -72,22 +76,24 @@ BUILT_SOURCES = \
 
 ## --- Yaccing and lexing ---
 
-parser.c parser.tab.h: $(srcdir)/parser.y
+$(srcdir)/parser.c $(srcdir)/parser.tab.h: $(srcdir)/parser.y
        @YACC@ -d -v $(srcdir)/parser.y
-       mv y.tab.c parser.c
-       mv y.tab.h parser.tab.h
+       mv y.tab.c $(srcdir)/parser.c
+       mv y.tab.h $(srcdir)/parser.tab.h
 
-lexer.c: $(srcdir)/lexer.l
+$(srcdir)/lexer.c: $(srcdir)/lexer.l
        @LEX@ $(srcdir)/lexer.l
-       mv lex.yy.c lexer.c
+       mv lex.yy.c $(srcdir)/lexer.c
 
 ## --- The main programs ---
 
 LDADD = libbcm.a @LEXLIB@
+
 become_SOURCES = become.c
 keygen_SOURCES = keygen.c
 
-become keygen: libbcm.a
+become_DEPENDENCIES = libbcm.a
+keygen_DEPENDENCIES = libbcm.a
 
 ##----- Testing -------------------------------------------------------------
 
@@ -126,4 +132,6 @@ md5-test: md5.tro libbcm.a
 netg-test: netg.tro libbcm.a
        $(LINK) netg.tro libbcm.a
 
+CLEANFILES = *.tro y.output
+
 ##----- That's all, folks ---------------------------------------------------