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

diff --git a/Makefile.m4 b/Makefile.m4
index d209903..c0f3f54 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.2 1999/10/23 12:55:35 mdw Exp $
+## $Id: Makefile.m4,v 1.9 1999/11/17 18:05:35 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,16 +29,37 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.2  1999/10/23 12:55:35  mdw
-## The `CVS' directory can't be hardlinked.  Don't worry about this
-## overmuch.
+## Revision 1.9  1999/11/17 18:05:35  mdw
+## Many new files and test cases for multiprecision arithmetic.
+##
+## Revision 1.9  1999/11/17 18:05:35  mdw
+## Many new files and test cases for multiprecision arithmetic.
+##
+## Revision 1.8  1999/11/13 01:56:07  mdw
+## Include multiprecision maths stuff.
 ##
+## Revision 1.7  1999/11/11 19:01:02  mdw
+## Use `libtool' to generate a shared library.
+##
+## Revision 1.6  1999/11/11 17:47:34  mdw
+## Updates for new configuration system, and `mptypes' generator.
+##
+## Revision 1.5  1999/11/11 00:59:17  mdw
+## Minor reformatting.
+##
+## Revision 1.4  1999/10/24 10:20:36  mdw
+## Modify for standalone distribution.  The library's getting far too large
+## to be sensibly embedded in other programs.
+##
+## Revision 1.3  1999/10/24 10:04:26  mdw
 ## Install headers in the right directory.
 ##
 ## Revision 1.2  1999/10/23 12:55:35  mdw
 ## The `CVS' directory can't be hardlinked.  Don't worry about this
 ## overmuch.
 ##
+## Revision 1.1  1999/09/03 08:41:11  mdw
+## Initial import.
 ##
 
 AUTOMAKE_OPTIONS = foreign
@@ -78,6 +99,11 @@ MODES = \
 	adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
 
 $(MODES): $(srcdir)/genmodes
+$(srcdir)/des_sp.h: des-mktab
+	./des-mktab >$(srcdir)/des_sp.h
+
+ptab.c ptab.h: genprimes
+	./genprimes -h ptab.h -c ptab.c	-m 256 -t "unsigned char" -i ptab
 
 archinclude_HEADERS = mptypes.h
 
@@ -89,10 +115,13 @@ BUILT_SOURCES = \
 	getdate.c \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
-INCLUDES = -I$(srcdir)/..
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.h')
-include_HEADERS = \
+
+## --- Building the main library ---
+libcatacomb_la_LDFLAGS = -version-info 0:3:0
+lib_LTLIBRARIES = libcatacomb.la
+
 libcatacomb_la_LDFLAGS = -version-info 0:4:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
@@ -101,27 +130,39 @@ define(`emit', `$1.h ')
 pkginclude_HEADERS = \
 	paranoia.h \
 	blkc.h hash.h \
+	rc4.h \
 	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpmont.h \
 	ptab.h pgen.h rabin.h \
 	dsa.h dh.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
-libcatacomb_a_SOURCES = \
+	allwithsuffix(`hashes', `hash_modes', `.h')
 
 define(`emit', `$1.c ')
 libcatacomb_la_SOURCES = \
 	des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
+	rc4.c \
+	rand.c noise.c \
+	key.c \
+	mpx.c mpscan.c mparena.c \
+	mpmont.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') \
-noinst_PROGRAMS = des-mktab
-LDADD = libcatacomb.a ../mLib/libmLib.a
+	addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
+
+des-base.lo: des_sp.h
+mpx.lo: mptypes.h
+
 ## --- Utility programs ---
 noinst_PROGRAMS = des-mktab mptypes
-LDADD = libcatacomb.a
+bin_PROGRAMS = key
 bin_SCRIPTS = catacomb-config
 noinst_PROGRAMS = des-mktab genprimes mptypes
 LDADD = libcatacomb.la
+
+key_SOURCES = keyutil.c getdate.y getdate.h
+
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
 
@@ -141,23 +182,27 @@ dist-hook:
 	@mkdir $(distdir)/tests
 	@ln $(srcdir)/tests/* $(distdir)/tests || true
 	@rm -f $(distdir)/tests/*~
-TESTS = \
-	rc4.t \
-	addsuffix(join(`ciphers', `-', `cipher_modes'), `.t') \
-	addsuffix(join(`hashes', `-', `hash_modes'), `.t') \
-	addsuffix(`ciphers', `.t') addsuffix(`hashes', `.t')
-	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
-	  $(srcdir)/$1.c libcatacomb.a ../mLib/libmLib.a -o $1.t')
-
-`$1.t: $1.c libcatacomb.a
-	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
+
+## --- Testing ---
+
+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)
 
 adorn(`nl`'CTESTRIG(', `ciphers', `)')
 adorn(`nl`'CTESTRIG(', `hashes', `)')
-CLEANFILES = *.t
+adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
+CTESTRIG(dsa-gen)
+CTESTRIG(dsa-sign)
 CTESTRIG(dsa-verify)
 CLEANFILES = *.t mptypes.h
 TESTS = testprogs