Separate libs. Update version

diff --git a/Makefile.am b/Makefile.am
index 85625d9..6caaeeb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = src include zoom lib etc doc 
+SUBDIRS = src include zoom etc doc 
 
 EXTRA_DIST= LICENSE README.txt TODO ChangeLog yaz++-config.in
 

diff --git a/configure.in b/configure.in
index b170663..c6265bc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++",0.7.7)
+AM_INIT_AUTOMAKE("yaz++",0.7.8)
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -102,7 +102,6 @@ AC_OUTPUT([
        include/yaz++/Makefile
        yaz++-config
        zoom/Makefile
-       lib/Makefile
        doc/Makefile
        doc/yaz++.xml
        doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c59ed8..cbc52c7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,9 @@
-## $Id: Makefile.am,v 1.21 2004-01-05 09:31:09 adam Exp $
+## $Id: Makefile.am,v 1.22 2004-02-11 10:01:54 adam Exp $
 
 AM_CXXFLAGS = $(YAZINC) -I$(srcdir)/../include $(XSLT_CFLAGS)
 
-noinst_LTLIBRARIES = libyazcpp.la
+lib_LTLIBRARIES = libyazcpp.la
+libyazcpp_la_LDFLAGS=-version-info 1:0:0
 
 libyazcpp_la_SOURCES=yaz-socket-manager.cpp yaz-pdu-assoc.cpp \
        yaz-z-assoc.cpp yaz-proxy.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 872cee6..23538ad 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.98 2004-02-10 15:02:19 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.99 2004-02-11 10:01:54 adam Exp $
  */
 
 #include <assert.h>
@@ -638,7 +638,7 @@ void Yaz_Proxy::convert_xsl_delay()
            xsltFreeStylesheet(m_stylesheet_xsp);
        m_stylesheet_xsp = 0;
        timeout(m_client_idletime);
-       int r = send_PDU_convert(m_stylesheet_apdu);
+       send_PDU_convert(m_stylesheet_apdu);
     }
     else
        timeout(0);

diff --git a/yaz++-config.in b/yaz++-config.in
index ef654bb..29d92b3 100644 (file)
--- a/yaz++-config.in
+++ b/yaz++-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz++-config.in,v 1.5 2004-02-11 10:01:54 adam Exp $
+# $Id: yaz++-config.in,v 1.6 2004-02-11 10:05:19 adam Exp $
 yazppprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -72,7 +72,9 @@ done
 libs_short="-lyazcpp -lzoomcpp"
 
 if test "$yaz_echo_source" = "yes"; then
-    YAZPPLIB="-L${yazpp_build_root}/src/.libs ${libs_short} $yazlibs"
+    YAZPPLIB="-L${yazpp_build_root}/src/.libs -lyazcpp"
+    YAZPPLIB="$YAZPPLIB -L${yazpp_build_root}/zoom/.libs -lzoomcpp"
+    YAZPPLIB="$YAZPPLIB $yazlibs"
     YAZPPLALIB="${yazpp_build_root}/src/libyazcpp.la $yazlalibs"
     YAZPPINC="@YAZINC@ -I${yazpp_src_root}/include"
 else

diff --git a/zoom/Makefile.am b/zoom/Makefile.am
index 08b7b19..cd60a48 100644 (file)
--- a/zoom/Makefile.am
+++ b/zoom/Makefile.am
@@ -1,12 +1,13 @@
-# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.10 2003-07-02 10:30:28 adam Exp $
+# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.11 2004-02-11 10:01:54 adam Exp $
 
 AM_CXXFLAGS= $(YAZINC) 
 
 if ZOOM
-noinst_LTLIBRARIES = libzoomcpp.la
+lib_LTLIBRARIES = libzoomcpp.la
 noinst_PROGRAMS = zclient
 endif
 
+libzoomcpp_la_LDFLAGS=-version-info 1:0:0
 LDADD=libzoomcpp.la $(YAZLALIB)
 
 mirk_sources = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp