Fix for daemon mode. Oops.

[become] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index aaaf90a..1fb2a2e 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.13 1999/05/04 16:50:59 mdw Exp $
+## $Id: Makefile.am,v 1.16 2003/10/12 00:39:16 mdw Exp $
 ##
 ## Makefile for `become'
 ##
@@ -29,6 +29,16 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.16  2003/10/12 00:39:16  mdw
+## Light fixes for strange building.
+##
+## Revision 1.15  2003/10/12 00:15:34  mdw
+## Fix to makefile install rules.
+##
+## Revision 1.14  2003/10/12 00:14:55  mdw
+## Major overhaul.  Now uses DSA signatures rather than the bogus symmetric
+## encrypt-and-hope thing.  Integrated with mLib and Catacomb.
+##
 ## Revision 1.13  1999/05/04 16:50:59  mdw
 ## Change library to `libbecome.a', for aesthetic reasons.
 ##
@@ -78,7 +88,7 @@
 
 ## --- What to make ---
 
-bin_PROGRAMS = become keygen bcquery
+bin_PROGRAMS = become bcquery
 noinst_LIBRARIES = libbecome.a
 
 ##----- Building the main code ----------------------------------------------
@@ -88,21 +98,12 @@ noinst_LIBRARIES = libbecome.a
 libbecome_a_SOURCES = \
        check.c daemon.c \
        lexer.l parser.y \
-       class.c name.c netg.c rule.c sym.c userdb.c ypstuff.c \
-       crypt.c \
-       noise.c rand.c \
-       icrypt.c blowfish.c md5.c \
-       mdwopt.c tx.c utils.c \
+       class.c name.c netg.c rule.c userdb.c ypstuff.c \
        \
        become.h \
        check.h daemon.h \
        lexer.h parse.h \
-       class.h name.h netg.h rule.h sym.h userdb.h ypstuff.h \
-       crypt.h \
-       noise.h rand.h \
-       icrypt.h blowfish.h blowfish-sbox.h md5.h \
-       mdwopt.h tx.h utils.h \
-       dbutils.h
+       class.h name.h netg.h rule.h userdb.h ypstuff.h
 
 BUILT_SOURCES = \
        parser.c parser.h lexer.c
@@ -121,17 +122,15 @@ dist-hook:
 LDADD = libbecome.a @LEXLIB@
 
 become_SOURCES = become.c
-keygen_SOURCES = keygen.c
 bcquery_SOURCES = bcquery.c
 
 become_DEPENDENCIES = libbecome.a
-keygen_DEPENDENCIES = libbecome.a
 bcquery_DEPENDENCIES = libbecome.a
 
 ##----- Become must be setuid root ------------------------------------------
 
 install-exec-hook:
-       become_prog=${bindir}/`echo become|sed '${transform}'`; \
+       become_prog=$(DESTDIR)/${bindir}/`echo become|sed '${transform}'`; \
        { chown root $${become_prog} && \
          chmod 4755 $${become_prog}; } || \
        { echo ">>>>>"; \
@@ -143,16 +142,13 @@ install-exec-hook:
 
 ## --- The test programs ---
 
-TESTS = \
-       name-test netg-test sym-test userdb-test \
-       crypt-test \
-       blowfish-test idea-test md5-test
+TESTS = name-test netg-test userdb-test
 
 ## --- How to build a test rig ---
 
 SUFFIXES = .tro
 .c.tro:
-       $(COMPILE) -DTEST_RIG $< -o $@
+       $(COMPILE) -DTEST_RIG $< -c -o $@
 
 ## --- Now build all the test programs ---
 ##
@@ -161,18 +157,10 @@ SUFFIXES = .tro
 
 name-test: name.tro libbecome.a
        $(LINK) name.tro libbecome.a $(LIBS)
-sym-test: sym.tro libbecome.a
-       $(LINK) sym.tro libbecome.a $(LIBS)
 userdb-test: userdb.tro libbecome.a
        $(LINK) userdb.tro libbecome.a $(LIBS)
-crypt-test: crypt.tro libbecome.a
-       $(LINK) crypt.tro libbecome.a $(LIBS)
-blowfish-test: blowfish.tro libbecome.a
-       $(LINK) blowfish.tro libbecome.a $(LIBS)
-md5-test: md5.tro libbecome.a
-       $(LINK) md5.tro libbecome.a $(LIBS)
 netg-test: netg.tro libbecome.a
-       $(LINK) netg.tro libbecome.a
+       $(LINK) netg.tro libbecome.a $(LIBS)
 
 CLEANFILES = *.tro y.output