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

diff --git a/Makefile.m4 b/Makefile.m4
index d209903..ab2225c 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.5 1999/11/11 00:59:17 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,10 +29,20 @@
 ##----- 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.5  1999/11/11 00:59:17  mdw
+## Minor reformatting.
+##
+## 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
@@ -89,10 +99,9 @@ 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 = \
+lib_LIBRARIES = libcatacomb.a
 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.
@@ -115,7 +124,7 @@ libcatacomb_la_SOURCES = \
 	dh-prime.c \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 noinst_PROGRAMS = des-mktab
-LDADD = libcatacomb.a ../mLib/libmLib.a
+
 ## --- Utility programs ---
 noinst_PROGRAMS = des-mktab mptypes
 LDADD = libcatacomb.a
@@ -146,8 +155,9 @@ 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')
+	$(COMPILE) \
+	  -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
+	  $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
 
 `$1.t: $1.c libcatacomb.a
 	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')