Improve dependencies for test programs.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index a8385d1..3a941f4 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.11 1999/11/20 22:24:53 mdw Exp $
+## $Id: Makefile.m4,v 1.15 1999/11/22 14:08:30 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,15 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.11  1999/11/20 22:24:53  mdw
-## Add Diffie-Hellman support.
+## Revision 1.15  1999/11/22 14:08:30  mdw
+## Improve dependencies for test programs.
+##
+## Revision 1.14  1999/11/22 00:17:09  mdw
+## Create object files for test programs so that rebuilding doesn't take so
+## long.
+##
+## Revision 1.12  1999/11/20 22:36:26  mdw
+## Improve dependencies.  Move mpx testing into mpx.c.
 ##
 ## Revision 1.11  1999/11/20 22:24:53  mdw
 ## Add Diffie-Hellman support.
@@ -127,7 +134,7 @@ BUILT_SOURCES = \
        addsuffix(join(`hashes', `-', `hash_modes'), `.h')
 
 ## --- Building the main library ---
-libcatacomb_la_LDFLAGS = -version-info 0:3:0
+
 lib_LTLIBRARIES = libcatacomb.la
 
 libcatacomb_la_LDFLAGS = -version-info 0:4:0
@@ -162,6 +169,7 @@ libcatacomb_la_SOURCES = \
        dsa-sign.c dsa-verify.c dsa-gen.c \
        dh-prime.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
+       addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
        addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
 
 des-base.lo: des_sp.h
@@ -206,12 +214,14 @@ define(`testprogs', `')
 define(`CTESTRIG',
 `define(`testprogs', testprogs \
        $1.t)dnl
-$1.t: $1.c libcatacomb.la
-       $(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c .libs/libcatacomb.a $(LIBS) -o $1.t')
+$1.to: $1.c
+       $(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
+$1.t: $1.to libcatacomb.la
+       $(CC) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
 
 CTESTRIG(rc4)
 adorn(`nl`'CTESTRIG(', `ciphers', `)')
-CTESTRIG(mpx-test)
+adorn(`nl`'CTESTRIG(', `hashes', `)')
 adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
 CTESTRIG(mpx)
@@ -227,7 +237,7 @@ CTESTRIG(dsa-verify)
 
 TESTS = testprogs
 
-CLEANFILES = *.t mptypes.h des_sp.h ptab.c ptab.h
+CLEANFILES = *.t *.to mptypes.h des_sp.h ptab.c ptab.h
 
 ## --- Makefile building (haha!) ---