From c7f30b36a38f7c6daae7262ae866f886d0433350 Mon Sep 17 00:00:00 2001
Message-Id: <c7f30b36a38f7c6daae7262ae866f886d0433350.1714152323.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 11 Nov 1999 18:47:34 +0000
Subject: [PATCH] Use `libtool' to generate a shared library.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 .links       |  2 --
 Makefile.am  | 21 +++++++++++++--------
 configure.in | 11 +++++++----
 setup        |  3 ++-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.links b/.links
index e734998..90b6916 100644
--- a/.links
+++ b/.links
@@ -1,6 +1,4 @@
 COPYING.LIB
-config.guess
-config.sub
 install-sh
 mdwopt.c
 mdwopt.h
diff --git a/Makefile.am b/Makefile.am
index 21a6309..2c1b4ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.16 1999/11/11 17:48:28 mdw Exp $
+## $Id: Makefile.am,v 1.17 1999/11/11 18:47:33 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.17  1999/11/11 18:47:33  mdw
+## Use `libtool' to generate a shared library.
+##
 ## Revision 1.16  1999/11/11 17:48:28  mdw
 ## New configuration system for library clients.
 ##
@@ -92,7 +95,7 @@ SUBDIRS = man
 
 bin_SCRIPTS = mLib-config
 
-lib_LIBRARIES = libmLib.a
+lib_LTLIBRARIES = libmLib.la
 libexec_PROGRAMS = bres
 
 pkginclude_HEADERS = \
@@ -104,9 +107,11 @@ pkginclude_HEADERS = \
 
 ## --- Things to put in the library ---
 
-## libmLib_la_LDFLAGS = -version-info 1:0
+libmLib_la_LDFLAGS = -version-info 7:0:6
+## Middle number is the patchlevel.  Final number is the minor version.  The
+## difference between the first and last numbers is major version.
 
-libmLib_a_SOURCES = \
+libmLib_la_SOURCES = \
 	alloc.c exc.c quis.c pquis.c report.c sub.c trace.c traceopt.c \
 		track.c \
 	darray.c dstr.c dputf.c dspool.c hash.c sym.c crc32.c \
@@ -120,7 +125,7 @@ noinst_PROGRAMS = da-test sym-test
 
 check: da-test.test sym-test.test
 
-da_test_LDADD = libmLib.a
+da_test_LDADD = libmLib.la
 da-test.in:
 	perl $(srcdir)/da-gtest 10000 >da-test.in
 da-test.ref: da-test.in
@@ -130,7 +135,7 @@ da-test.test: da-test da-test.in da-test.ref
 	cmp da-test.test da-test.ref
 	@echo "darray tested OK."
 
-sym_test_LDADD = libmLib.a
+sym_test_LDADD = libmLib.la
 sym-test.in:
 	perl $(srcdir)/sym-gtest 10000 >sym-test.in
 sym-test.ref: sym-test.in
@@ -159,8 +164,8 @@ bres: bres-stnd.o
 bres-stnd.o: $(srcdir)/bres.c
 	$(COMPILE) -c -DBRES_STANDALONE -o bres-stnd.o $(srcdir)/bres.c
 
-bres.o: $(srcdir)/bres.c
-	$(COMPILE) -c -DBRES_SERVER="\"$(libexecdir)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c
+bres.lo: $(srcdir)/bres.c
+	$(LTCOMPILE) -c -DBRES_SERVER="\"$(libexecdir)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c
 
 ## --- Other useful rules ---
 
diff --git a/configure.in b/configure.in
index f3771e2..dca4196 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.18 1999/11/11 17:48:28 mdw Exp $
+dnl $Id: configure.in,v 1.19 1999/11/11 18:47:33 mdw Exp $
 dnl
 dnl Configuration script for mLib
 dnl
@@ -29,6 +29,9 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.19  1999/11/11 18:47:33  mdw
+dnl Use `libtool' to generate a shared library.
+dnl
 dnl Revision 1.18  1999/11/11 17:48:28  mdw
 dnl New configuration system for library clients.
 dnl
@@ -63,12 +66,12 @@ dnl Initial version of mLib
 dnl
 
 AC_INIT(exc.c)
-AM_INIT_AUTOMAKE(mLib, 1.5.0)
+AM_INIT_AUTOMAKE(mLib, 1.6.0)
 
 AC_PROG_CC
-mdw_GCC_FLAGS
 AC_CHECK_PROG(AR, ar, ar)
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
+mdw_GCC_FLAGS
 
 mdw_CHECK_MANYLIBS(socket, socket)
 mdw_CHECK_MANYLIBS(gethostbyname, nsl resolv)
diff --git a/setup b/setup
index 89b6db8..4b49c41 100755
--- a/setup
+++ b/setup
@@ -2,8 +2,9 @@
 
 set -e
 mklinks
-(cd man && ./mksofiles * && m4 Makefile.m4 >Makefile.am)
 mkaclocal
+libtoolize
+(cd man && ./mksofiles * && m4 Makefile.m4 >Makefile.am)
 autoconf
 automake
 mkdir build
-- 
[mdw]