X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/471db039b8a91c5ee13696254cca563e74d48194..10607a708e616a3c911e2b07d412d1b1895845b2:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index c0f3f54..f5461b3 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.9 1999/11/17 18:05:35 mdw Exp $
+## $Id: Makefile.m4,v 1.16 1999/11/22 20:51:33 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,24 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.9  1999/11/17 18:05:35  mdw
-## Many new files and test cases for multiprecision arithmetic.
+## Revision 1.16  1999/11/22 20:51:33  mdw
+## Add yet more source files.
+##
+## 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.
+##
+## Revision 1.10  1999/11/19 19:28:24  mdw
+## Add DSA files and tests.
 ##
 ## Revision 1.9  1999/11/17 18:05:35  mdw
 ## Many new files and test cases for multiprecision arithmetic.
@@ -99,8 +115,11 @@ MODES = \
 	adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
 
 $(MODES): $(srcdir)/genmodes
-$(srcdir)/des_sp.h: des-mktab
-	./des-mktab >$(srcdir)/des_sp.h
+	cd $(srcdir); ./genmodes "lit(`ciphers')" "lit(`cipher_modes')"
+	cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')"
+
+des_sp.h: des-mktab
+	./des-mktab >des_sp.h
 
 ptab.c ptab.h: genprimes
 	./genprimes -h ptab.h -c ptab.c	-m 256 -t "unsigned char" -i ptab
@@ -108,7 +127,6 @@ ptab.c ptab.h: genprimes
 archinclude_HEADERS = mptypes.h
 
 mptypes.h: mptypes
-	des_sp.h \
 	./mptypes >mptypes.h
 
 BUILT_SOURCES = \
@@ -119,7 +137,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
@@ -131,7 +149,9 @@ pkginclude_HEADERS = \
 	paranoia.h \
 	blkc.h hash.h \
 	rc4.h \
-	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpmont.h \
+	rand.h noise.h \
+	key.h \
+	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpmont.h mpcrt.h \
 	ptab.h pgen.h rabin.h \
 	dsa.h dh.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
@@ -144,18 +164,23 @@ libcatacomb_la_SOURCES = \
 	rand.c noise.c \
 	key.c \
 	mpx.c mpscan.c mparena.c \
-	mpmont.c \
+	mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
+	mp-gcd.c mp-jacobi.c \
+	mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
+	mpmont.c mpmont-mexp.c \
+	mpcrt.c \
 	ptab.c pgen.c rabin.c \
 	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
 mpx.lo: mptypes.h
 
 ## --- Utility programs ---
-noinst_PROGRAMS = des-mktab mptypes
+
 bin_PROGRAMS = key
 bin_SCRIPTS = catacomb-config
 noinst_PROGRAMS = des-mktab genprimes mptypes
@@ -163,6 +188,9 @@ LDADD = libcatacomb.la
 
 key_SOURCES = keyutil.c getdate.y getdate.h
 
+des_mktab_SOURCES = des-mktab.c
+des_mktab_LDADD =
+
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
 
@@ -190,31 +218,39 @@ define(`testprogs', `')
 define(`CTESTRIG',
 `define(`testprogs', testprogs \
 	$1.t)dnl
-$1.t: $1.c libcatacomb.la
-CTESTRIG(mpx-test)
-adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
-adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
-CTESTRIG(mpx)
-CTESTRIG(mptext)
+$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', `)')
 adorn(`nl`'CTESTRIG(', `hashes', `)')
 adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
+CTESTRIG(mpx)
+CTESTRIG(mptext)
+CTESTRIG(mp-arith)
+CTESTRIG(mp-gcd)
+CTESTRIG(mp-jacobi)
+CTESTRIG(mpmont)
+CTESTRIG(mpmont-mexp)
+CTESTRIG(mpcrt)
+CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
 CTESTRIG(dsa-verify)
-CLEANFILES = *.t mptypes.h
+
 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!) ---
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
 	m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
-	$(MODES) $(srcdir)/des_sp.h \
-	$(srcdir)/getdate.c getdate.c
+
+MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.am \
 	$(srcdir)/getdate.c getdate.c \
 	$(MODES)