Merged blowfish branch into trunk.

[become] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 88434ec..9635e72 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.1 1997/08/04 10:22:09 mdw Exp $
+## $Id: Makefile.am,v 1.7 1997/09/26 09:14:57 mdw Exp $
 ##
 ## Makefile for `become'
 ##
@@ -29,16 +29,35 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
-## Revision 1.1  1997/08/04 10:22:09  mdw
+## Revision 1.7  1997/09/26 09:14:57  mdw
+## Merged blowfish branch into trunk.
+##
+## Revision 1.6.2.1  1997/09/26 09:07:56  mdw
+## Use the Blowfish encryption algorithm instead of IDEA.  This is partly
+## because I prefer Blowfish (without any particularly strong evidence) but
+## mainly because IDEA is patented and Blowfish isn't.
+##
+## Revision 1.6  1997/09/18 11:17:18  mdw
+## Fix comment leaders.  Don't know why this CVS keeps breaking them.
+## Could be DEC's bogus version of RCS being picked up.
+##
+## Revision 1.5  1997/09/17  10:28:25  mdw
+## Remove `set.c'.  No longer necessary.
+##
+## 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.
+##
+## Revision 1.2  1997/08/04 10:24:19  mdw
 ## Sources placed under CVS control.
 ##
 
 ##----- General setup things ------------------------------------------------
 
-## --- Standard setup things ---
-
-AUTOMAKE_OPTIONS = foreign
-
 ## --- What to make ---
 
 bin_PROGRAMS = become keygen
@@ -51,49 +70,52 @@ noinst_LIBRARIES = bcm
 bcm_SOURCES = \
        check.c daemon.c \
        lexer.l parser.y \
-       class.c name.c rule.c set.c sym.c userdb.c \
+       class.c name.c netg.c rule.c sym.c userdb.c \
        crypt.c \
        noise.c rand.c \
-       icrypt.c idea.c md5.c \
+       icrypt.c blowfish.c md5.c \
        mdwopt.c tx.c utils.c \
        \
        become.h \
        check.h daemon.h \
        lexer.h parser.h \
-       class.h name.h rule.h set.h sym.h userdb.h \
+       class.h name.h netg.h rule.h sym.h userdb.h \
        crypt.h \
        noise.h rand.h \
-       icrypt.h idea.h md5.h \
-       mdwopt.h tx.h utils.h
+       icrypt.h blowfish.h blowfish-sbox.h md5.h \
+       mdwopt.h tx.h utils.h \
+       dbutils.h
 
 BUILT_SOURCES = \
        parser.c lexer.c parser.tab.h
 
 ## --- 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 @LIBS@ @LEXLIB@
+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 -------------------------------------------------------------
 
 ## --- The test programs ---
 
 TESTS = \
-       name-test sym-test userdb-test netg-test \
+       name-test netg-test sym-test userdb-test \
        crypt-test \
        blowfish-test idea-test md5-test
 
@@ -125,4 +147,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 ---------------------------------------------------