Fixing for new autotools.

[become] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 57a4751..66e8060 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.14 2003/10/12 00:14:55 mdw Exp $
+## $Id$
 ##
 ## Makefile for `become'
 ##
@@ -26,58 +26,6 @@
 ## along with `become'; if not, write to the Free Software Foundation,
 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-##----- Revision history ----------------------------------------------------
-##
-## $Log: Makefile.am,v $
-## 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.
-##
-## Revision 1.12  1999/05/04 16:36:03  mdw
-## Changes for new Automake version.
-##
-## Revision 1.11  1998/06/18  15:52:05  mdw
-## Remove the IDEA test case.
-##
-## Revision 1.10  1998/04/23 13:17:17  mdw
-## New program `bcquery', and `ypstuff' module added.
-##
-## Revision 1.9  1998/02/20 18:12:35  mdw
-## Make the `become' program setuid root when installing.
-##
-## Revision 1.8  1998/01/12 16:45:36  mdw
-## Fix copyright date.
-##
-## 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 ------------------------------------------------
 
 ## --- What to make ---
@@ -104,7 +52,7 @@ BUILT_SOURCES = \
 
 ## --- Yaccing and lexing ---
 
-YFLAGS = -d -v
+AM_YFLAGS = -d -v
 
 dist-hook:
        for i in $(BUILT_SOURCES); do \
@@ -124,7 +72,7 @@ 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 ">>>>>"; \
@@ -136,16 +84,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 ---
 ##
@@ -154,18 +99,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