From cb007c6145b0dbb3fcbe9826f081650becf9a05c Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 24 Aug 2004 10:37:18 +0000
Subject: [PATCH] Switching to Libtool shared libraries for Zebra.

---
 bfile/Makefile.am      |    6 +++---
 buildconf.sh           |    3 ++-
 configure.in           |    3 ++-
 data1/Makefile.am      |   10 +++++-----
 dfa/Makefile.am        |    8 ++++----
 dict/Makefile.am       |   12 ++++++++----
 index/Makefile.am      |   40 ++++++++++++++++++++--------------------
 isamb/Makefile.am      |   10 +++++-----
 isamc/Makefile.am      |    8 ++++----
 isams/Makefile.am      |    6 +++---
 recctrl/Makefile.am    |    6 +++---
 rset/Makefile.am       |    6 +++---
 test/api/Makefile.am   |   17 +++++++++++++++--
 test/codec/Makefile.am |   17 +++++++++++++++--
 util/Makefile.am       |    9 +++++----
 15 files changed, 97 insertions(+), 64 deletions(-)

diff --git a/bfile/Makefile.am b/bfile/Makefile.am
index 28ae99f..f375a78 100644
--- a/bfile/Makefile.am
+++ b/bfile/Makefile.am
@@ -1,7 +1,7 @@
-## $Id: Makefile.am,v 1.2 2004-06-16 20:49:17 adam Exp $ Copyright (C) 1994-1998, Index Data ApS
-noinst_LIBRARIES = libbfile.a
+## $Id: Makefile.am,v 1.3 2004-08-24 10:37:18 adam Exp $ Copyright (C) 1994-1998, Index Data ApS
+lib_LTLIBRARIES = libidzebra-bfile.la
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
 
-libbfile_a_SOURCES = bfile.c mfile.c cfile.c commit.c cfile.h
+libidzebra_bfile_la_SOURCES = bfile.c mfile.c cfile.c commit.c cfile.h
 
diff --git a/buildconf.sh b/buildconf.sh
index 122cff1..40377c2 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.10 2003-05-06 12:09:24 adam Exp $
+# $Id: buildconf.sh,v 1.11 2004-08-24 10:37:18 adam Exp $
 set -x
 dir=`aclocal --print-ac-dir`
 if [ -f $dir/yaz.m4 ]; then
@@ -7,6 +7,7 @@ if [ -f $dir/yaz.m4 ]; then
 else
 	aclocal -I .
 fi
+libtoolize --automake --force 
 automake -a 
 automake -a 
 autoconf
diff --git a/configure.in b/configure.in
index c8589fe..23b9844 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,9 @@
 dnl Zebra, Index Data Aps, 1995-2004
-dnl $Id: configure.in,v 1.93 2004-08-06 13:14:46 adam Exp $
+dnl $Id: configure.in,v 1.94 2004-08-24 10:37:18 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AM_INIT_AUTOMAKE(idzebra,1.4.0)
+AM_PROG_LIBTOOL
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
diff --git a/data1/Makefile.am b/data1/Makefile.am
index aabd6c0..b72eb94 100644
--- a/data1/Makefile.am
+++ b/data1/Makefile.am
@@ -1,10 +1,10 @@
-## $Id: Makefile.am,v 1.1 2002-10-22 12:53:33 adam Exp $
+## $Id: Makefile.am,v 1.2 2004-08-24 10:37:18 adam Exp $
 
-noinst_LIBRARIES=libdata1.a
+lib_LTLIBRARIES=libidzebra-data1.la
 
-libdata1_a_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c d1_absyn.c \
-  d1_grs.c d1_sutrs.c d1_varset.c d1_espec.c d1_doespec.c d1_map.c d1_marc.c \
-  d1_write.c d1_expout.c d1_sumout.c d1_soif.c d1_prtree.c d1_if.c
+libidzebra_data1_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c \
+  d1_absyn.c d1_grs.c d1_sutrs.c d1_varset.c d1_espec.c d1_doespec.c d1_map.c \
+  d1_marc.c d1_write.c d1_expout.c d1_sumout.c d1_soif.c d1_prtree.c d1_if.c
 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(YAZINC)
 
diff --git a/dfa/Makefile.am b/dfa/Makefile.am
index a6d885d..e12ce80 100644
--- a/dfa/Makefile.am
+++ b/dfa/Makefile.am
@@ -1,11 +1,11 @@
-## $Id: Makefile.am,v 1.3 2004-06-16 20:49:17 adam Exp $
+## $Id: Makefile.am,v 1.4 2004-08-24 10:37:18 adam Exp $
 
-noinst_LIBRARIES = libdfa.a
+lib_LTLIBRARIES = libidzebra-dfa.la
 
 noinst_PROGRAMS = agrep lexer grepper
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
-LDADD = libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB)
+LDADD = libdfa.a ../util/libutil.a $(YAZLALIB) $(TCL_LIB)
 
 agrep_SOURCES = agrep.c
 
@@ -13,5 +13,5 @@ lexer_SOURCES = lexer.c readfile.c
 
 grepper_SOURCES = grepper.c
 
-libdfa_a_SOURCES = dfa.c imalloc.c states.c set.c bset.c \
+libidzebra_dfa_la_SOURCES = dfa.c imalloc.c states.c set.c bset.c \
  dfap.h imalloc.h lexer.h
diff --git a/dict/Makefile.am b/dict/Makefile.am
index 5045062..105ad88 100644
--- a/dict/Makefile.am
+++ b/dict/Makefile.am
@@ -1,13 +1,17 @@
-## $Id: Makefile.am,v 1.6 2004-06-16 20:49:18 adam Exp $
+## $Id: Makefile.am,v 1.7 2004-08-24 10:37:18 adam Exp $
 
-noinst_LIBRARIES = libdict.a
+lib_LTLIBRARIES = libidzebra-dict.la
 noinst_PROGRAMS = dicttest dictext
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
 
-LDADD = libdict.a ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB)
+LDADD = libidzebra-dict.la \
+ ../util/libidzebra-util.la \
+ ../bfile/libidzebra-bfile.la \
+ ../dfa/libidzebra-dfa.la \
+  $(TCL_LIB) $(YAZLALIB)
 
-libdict_a_SOURCES = scan.c dopen.c dclose.c drdwr.c open.c close.c insert.c \
+libidzebra_dict_la_SOURCES = scan.c dopen.c dclose.c drdwr.c open.c close.c insert.c \
  lookup.c lookupec.c lookgrep.c delete.c dcompact.c
 
 dicttest_SOURCES = dicttest.c
diff --git a/index/Makefile.am b/index/Makefile.am
index 115c94d..2d5d3dd 100644
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,41 +1,41 @@
-## $Id: Makefile.am,v 1.25 2004-08-09 08:40:09 adam Exp $
+## $Id: Makefile.am,v 1.26 2004-08-24 10:37:18 adam Exp $
 
 noinst_PROGRAMS = apitest kdump
 
-noinst_LIBRARIES = libzebra.a
+lib_LTLIBRARIES = libidzebra-api.la
 
-libzebra_a_SOURCES = dir.c dirs.c trav.c kinput.c kcompare.c \
+libidzebra_api_la_SOURCES = dir.c dirs.c trav.c kinput.c kcompare.c \
  attribute.c symtab.c recindex.c recstat.c lockutil.c  \
  zebraapi.c zinfo.c invstat.c sortidx.c compact.c zsets.c zrpn.c \
  rank1.c trunc.c retrieve.c extract.c livcode.c \
  index.h recindex.h recindxp.h \
  zinfo.h zserver.h zvrank.c
 
-libzebra_a_LIBADD = \
- ../rset/librset.a ../dict/libdict.a  \
- ../isams/libisams.a ../isamc/libisamc.a ../isamb/libisamb.a \
- ../recctrl/librecctrl.a ../data1/libdata1.a ../bfile/libbfile.a \
- ../dfa/libdfa.a ../util/libutil.a
-
 bin_PROGRAMS = zebraidx zebrasrv zebrash
 
+zebralibs = \
+ ../rset/libidzebra-rset.la \
+ ../dict/libidzebra-dict.la  \
+ ../isams/libidzebra-isams.la \
+ ../isamc/libidzebra-isamc.la \
+ ../isamb/libidzebra-isamb.la \
+ ../recctrl/libidzebra-recctrl.la \
+ ../data1/libidzebra-data1.la \
+ ../bfile/libidzebra-bfile.la \
+ ../dfa/libidzebra-dfa.la \
+ ../util/libidzebra-util.la \
+ ../index/libidzebra-api.la
+
 zebraidx_SOURCES = main.c
 zebrasrv_SOURCES = zserver.c
 zebrash_SOURCES = zebrash.c
 apitest_SOURCES = apitest.c
 kdump_SOURCES = kdump.c
 
-AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
+AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) \
+  -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
 
-zebrash_LDADD= libzebra.a $(YAZLIB) $(READLINE_LIBS) $(TCL_LIB)
+zebrash_LDADD= $(zebralibs) $(YAZLALIB) $(READLINE_LIBS) $(TCL_LIB)
 
-LDADD = libzebra.a $(YAZLIB) $(TCL_LIB)
+LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB)
 
-libzebra.a: $(libzebra_a_OBJECTS) $(libzebra_a_DEPENDENCIES)
-	-mkdir atmp
-	-rm -f libzebra.a
-	-rm -f atmp/*.o
-	for i in $(libzebra_a_LIBADD); do cd atmp; rm -f __*; ar x ../$$i; cd ..; done
-	ar cru libzebra.a $(libzebra_a_OBJECTS) atmp/*.o
-	-rm -fr atmp
-	$(RANLIB) libzebra.a
diff --git a/isamb/Makefile.am b/isamb/Makefile.am
index 37aadc9..1de6eed 100644
--- a/isamb/Makefile.am
+++ b/isamb/Makefile.am
@@ -1,16 +1,16 @@
-## $Id: Makefile.am,v 1.4 2004-06-16 20:49:18 adam Exp $
+## $Id: Makefile.am,v 1.5 2004-08-24 10:37:18 adam Exp $
 
-noinst_LIBRARIES = libisamb.a
+lib_LTLIBRARIES = libidzebra-isamb.la
 
 check_PROGRAMS = tstisamb
 
 TESTS = $(check_PROGRAMS)
 
 tstisamb_SOURCES = tstisamb.c
-tstisamb_LDADD = libisamb.a ../bfile/libbfile.a ../util/libutil.a $(YAZLIB)
+tstisamb_LDADD = libisamb.a ../bfile/libbfile.a ../util/libutil.a $(YAZLALIB)
 
-libisamb_a_SOURCES = isamb.c
+libidzebra_isamb_la_SOURCES = isamb.c
 
 AM_CPPFLAGS=-I$(srcdir)/../include $(YAZINC)
 
-LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB)
+LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLALIB) $(TCL_LIB)
diff --git a/isamc/Makefile.am b/isamc/Makefile.am
index debc464..142a4fd 100644
--- a/isamc/Makefile.am
+++ b/isamc/Makefile.am
@@ -1,9 +1,9 @@
-## $Id: Makefile.am,v 1.5 2004-08-04 08:35:24 adam Exp $
+## $Id: Makefile.am,v 1.6 2004-08-24 10:37:18 adam Exp $
 
-noinst_LIBRARIES = libisamc.a
+lib_LTLIBRARIES = libidzebra-isamc.la
 
-libisamc_a_SOURCES = isamc.c merge.c isamc-p.h
+libidzebra_isamc_la_SOURCES = isamc.c merge.c isamc-p.h
 
 AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../index $(YAZINC)
 
-LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB)
+LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLALIB) $(TCL_LIB)
diff --git a/isams/Makefile.am b/isams/Makefile.am
index 67d44ae..d199ea3 100644
--- a/isams/Makefile.am
+++ b/isams/Makefile.am
@@ -1,7 +1,7 @@
-## $Id: Makefile.am,v 1.2 2004-06-16 20:49:18 adam Exp $
+## $Id: Makefile.am,v 1.3 2004-08-24 10:37:18 adam Exp $
 
-noinst_LIBRARIES = libisams.a
+lib_LTLIBRARIES = libidzebra-isams.la
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
 
-libisams_a_SOURCES = isams.c
+libidzebra_isams_la_SOURCES = isams.c
diff --git a/recctrl/Makefile.am b/recctrl/Makefile.am
index 69ecc00..bd1573a 100644
--- a/recctrl/Makefile.am
+++ b/recctrl/Makefile.am
@@ -1,6 +1,6 @@
-## $Id: Makefile.am,v 1.10 2004-06-16 20:49:18 adam Exp $
+## $Id: Makefile.am,v 1.11 2004-08-24 10:37:18 adam Exp $
 
-noinst_LIBRARIES = librecctrl.a
+lib_LTLIBRARIES = libidzebra-recctrl.la
 
 EXTRA_DIST=perlread.c perlread.h.in
 
@@ -10,7 +10,7 @@ else
 PERLREAD=
 endif	
 
-librecctrl_a_SOURCES = recctrl.c recgrs.c sgmlread.c regxread.c \
+libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c regxread.c \
 	marcread.c marcomp.c marcomp.h inline.c inline.h rectext.c \
 	grsread.h recgrs.h rectext.h xmlread.c danbibr.c \
 	$(PERLREAD)
diff --git a/rset/Makefile.am b/rset/Makefile.am
index 01b1f9b..4cc0b28 100644
--- a/rset/Makefile.am
+++ b/rset/Makefile.am
@@ -1,7 +1,7 @@
-## $Id: Makefile.am,v 1.10 2004-08-20 14:44:46 heikki Exp $
-noinst_LIBRARIES = librset.a
+## $Id: Makefile.am,v 1.11 2004-08-24 10:37:18 adam Exp $
+lib_LTLIBRARIES = libidzebra-rset.la
 
-librset_a_SOURCES = rset.c rstemp.c rsnull.c rsbool.c rsbetween.c \
+libidzebra_rset_la_SOURCES = rset.c rstemp.c rsnull.c rsbool.c rsbetween.c \
 	rsisamc.c rsmultior.c rsisams.c rsisamb.c rsprox.c 
 
 #rsm_or.c removed
diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 4ab3f93..136e300 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.13 2004-08-13 13:16:52 adam Exp $
+# $Id: Makefile.am,v 1.14 2004-08-24 10:37:19 adam Exp $
 
 noinst_PROGRAMS = testclient
 testclient_SOURCES = testclient.c
@@ -17,5 +17,18 @@ t6_SOURCES = t6.c
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(YAZINC)
 
-LDADD = ../../index/libzebra.a $(YAZLIB) $(TCL_LIB)
+zebralibs = \
+ ../../rset/libidzebra-rset.la \
+ ../../dict/libidzebra-dict.la  \
+ ../../isams/libidzebra-isams.la \
+ ../../isamc/libidzebra-isamc.la \
+ ../../isamb/libidzebra-isamb.la \
+ ../../recctrl/libidzebra-recctrl.la \
+ ../../data1/libidzebra-data1.la \
+ ../../bfile/libidzebra-bfile.la \
+ ../../dfa/libidzebra-dfa.la \
+ ../../util/libidzebra-util.la \
+ ../../index/libidzebra-api.la
+
+LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB)
 
diff --git a/test/codec/Makefile.am b/test/codec/Makefile.am
index 2c5d3f0..0349498 100644
--- a/test/codec/Makefile.am
+++ b/test/codec/Makefile.am
@@ -1,11 +1,24 @@
-# $Id: Makefile.am,v 1.1 2004-06-09 12:13:03 adam Exp $
+# $Id: Makefile.am,v 1.2 2004-08-24 10:37:19 adam Exp $
 
 TESTS = tstcodec
 
+zebralibs = \
+ ../../rset/libidzebra-rset.la \
+ ../../dict/libidzebra-dict.la  \
+ ../../isams/libidzebra-isams.la \
+ ../../isamc/libidzebra-isamc.la \
+ ../../isamb/libidzebra-isamb.la \
+ ../../recctrl/libidzebra-recctrl.la \
+ ../../data1/libidzebra-data1.la \
+ ../../bfile/libidzebra-bfile.la \
+ ../../dfa/libidzebra-dfa.la \
+ ../../util/libidzebra-util.la \
+ ../../index/libidzebra-api.la
+
 tstcodec_SOURCES = tstcodec.c
 
 noinst_PROGRAMS = tstcodec
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(YAZINC)
 
-LDADD = ../../index/libzebra.a $(YAZLIB) $(TCL_LIB)
+LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB)
diff --git a/util/Makefile.am b/util/Makefile.am
index 10ee531..12e2f59 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,14 +1,15 @@
-## $Id: Makefile.am,v 1.9 2004-08-04 08:35:27 adam Exp $
+## $Id: Makefile.am,v 1.10 2004-08-24 10:37:20 adam Exp $
 
-noinst_LIBRARIES = libutil.a
+lib_LTLIBRARIES = libidzebra-util.la
 
 noinst_PROGRAMS = passtest
 
 EXTRA_DIST = zebrasrv.rh
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
-LDADD = libutil.a $(YAZLIB) $(TCL_LIB)
+LDADD = libidzebra-util.la $(TCL_LIB) $(YAZLALIB)
 
-libutil_a_SOURCES = res.c charmap.c zebramap.c passwddb.c zebra-lock.c dirent.c xpath.c atoi_zn.c
+libidzebra_util_la_SOURCES = res.c charmap.c zebramap.c passwddb.c \
+ zebra-lock.c dirent.c xpath.c atoi_zn.c
 
 passtest_SOURCES = passtest.c
-- 
1.7.10.4