X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b9b1c853917df1504dba8930834525f30b820076..ffc086dbf2a2f4d875a5b0f8492ee4d52636b82b:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index c381793..24966e6 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.6 1999/11/11 17:47:34 mdw Exp $
+## $Id: Makefile.m4,v 1.7 1999/11/11 19:01:02 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,8 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## 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.7  1999/11/11 19:01:02  mdw
 ## Use `libtool' to generate a shared library.
@@ -111,7 +111,11 @@ BUILT_SOURCES = \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.h')
-lib_LIBRARIES = libcatacomb.a
+
+## --- 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.
@@ -124,7 +128,7 @@ pkginclude_HEADERS = \
 	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 = \
@@ -138,7 +142,7 @@ 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
@@ -171,8 +175,8 @@ TESTS = \
 	addsuffix(`ciphers', `.t') addsuffix(`hashes', `.t')
 ## --- Testing ---
 
-`$1.t: $1.c libcatacomb.a
-	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
+`$1.t: $1.c libcatacomb.la
+`define(`testprogs', testprogs \
 	$1.t)dnl
 $1.t: $1.c libcatacomb.la