X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/3701c54feff3a13c98213124f16f0e98f8c9eff8..a094cab7007f2e759ef0854a7592d2b8fd3c6b2e:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index ae7117f..c381793 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.3 1999/10/24 10:04:26 mdw Exp $
+## $Id: Makefile.m4,v 1.6 1999/11/11 17:47:34 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,9 +29,19 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.3  1999/10/24 10:04:26  mdw
-## Install headers in the right directory.
+## Revision 1.6  1999/11/11 17:47:34  mdw
+## Updates for new configuration system, and `mptypes' generator.
+##
+## 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.
 ##
@@ -42,6 +52,8 @@
 ## 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
@@ -81,6 +93,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
 
@@ -92,7 +109,6 @@ 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')
 lib_LIBRARIES = libcatacomb.a
@@ -117,14 +133,18 @@ libcatacomb_la_SOURCES = \
 	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
+des-base.lo: des_sp.h
+mpx.lo: mptypes.h
+
 ## --- Utility programs ---
 noinst_PROGRAMS = des-mktab mptypes
 LDADD = libcatacomb.a
 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 =
 
@@ -149,8 +169,7 @@ TESTS = \
 	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')
+## --- Testing ---
 
 `$1.t: $1.c libcatacomb.a
 	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
@@ -159,7 +178,7 @@ $1.t: $1.c libcatacomb.la
 
 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-verify)
 CLEANFILES = *.t mptypes.h