Common lib

diff --git a/Makefile.am b/Makefile.am
index 3d89842..1dff0ce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
 AUTOMAKE_OPTIONS = foreign
 

-SUBDIRS = src include zoom
+SUBDIRS = src include zoom lib doc

 
 EXTRA_DIST= LICENSE README.txt ChangeLog yaz++-config.in
 
 
 EXTRA_DIST= LICENSE README.txt ChangeLog yaz++-config.in
 

diff --git a/configure.in b/configure.in
index 42a6ad4..355c0d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,7 @@ AC_OUTPUT([
        yaz++-config
        src/yaz++-config
        zoom/Makefile
        yaz++-config
        src/yaz++-config
        zoom/Makefile

+       lib/Makefile

        doc/Makefile
        doc/yaz++.xml
        doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl
        doc/Makefile
        doc/yaz++.xml
        doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 83276c0..eb1be21 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.1 2002-10-08 11:55:57 adam Exp $
+## $Id: Makefile.am,v 1.2 2002-10-09 16:17:26 adam Exp $

 docdir=$(datadir)/doc/@PACKAGE@
 
 SUPPORTFILES = \
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUPPORTFILES = \

@@ -32,7 +32,7 @@ yaz++.pdf: $(XMLFILES)
        pdfjadetex yaz++.tex
        pdfjadetex yaz++.tex
 
        pdfjadetex yaz++.tex
        pdfjadetex yaz++.tex
 

-dist-hook: yaz++.html
+dist-hook: zoom.html

        cp *.html $(distdir)
 
 clean-data-hook:
        cp *.html $(distdir)
 
 clean-data-hook:

diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644 (file)
index 0000000..7a81483
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,10 @@
+## $Id: Makefile.am,v 1.1 2002-10-09 16:17:26 adam Exp $
+
+LDFLAGS=-version-info 1:0:0
+
+lib_LTLIBRARIES = libyaz++.la
+
+libyaz___la_LIBADD=../zoom/libzoomcpp.la ../src/libyazcpp.la 
+libyaz___la_SOURCES=
+EXTRA_libyaz___la_SOURCES=x.c
+

diff --git a/lib/x.c b/lib/x.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/Makefile.am b/src/Makefile.am
index 459e973..fc6d0c2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,17 @@
-## $Id: Makefile.am,v 1.10 2002-04-15 09:43:30 adam Exp $
+## $Id: Makefile.am,v 1.11 2002-10-09 16:17:26 adam Exp $

 
 AM_CXXFLAGS = $(YAZINC) -I$(srcdir)/../include
 
 
 AM_CXXFLAGS = $(YAZINC) -I$(srcdir)/../include
 

-lib_LTLIBRARIES = libyaz++.la
+noinst_LTLIBRARIES = libyazcpp.la

 
 

-libyaz___la_SOURCES=yaz-socket-manager.cpp yaz-pdu-assoc.cpp \
+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 \
        yaz-z-server.cpp yaz-pdu-assoc-thread.cpp yaz-z-server-sr.cpp \
        yaz-z-server-ill.cpp yaz-z-server-update.cpp yaz-z-databases.cpp
 
 EXTRA_DIST=yaz-z-server-ursula.cpp
 
        yaz-z-assoc.cpp yaz-proxy.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \
        yaz-z-server.cpp yaz-pdu-assoc-thread.cpp yaz-z-server-sr.cpp \
        yaz-z-server-ill.cpp yaz-z-server-update.cpp yaz-z-databases.cpp
 
 EXTRA_DIST=yaz-z-server-ursula.cpp
 

-libyaz___la_LDFLAGS=-version-info 0:0:0
+libyazcpp_la_LDFLAGS=-version-info 0:0:0

 
 bin_PROGRAMS = yaz-my-client yaz-my-server yaz-proxy
 bin_SCRIPTS = yaz++-config
 
 bin_PROGRAMS = yaz-my-client yaz-my-server yaz-proxy
 bin_SCRIPTS = yaz++-config

@@ -22,4 +22,4 @@ yaz_my_server_SOURCES=yaz-my-server.cpp yaz-marc-sample.cpp
 
 yaz_proxy_SOURCES=yaz-proxy-main.cpp
 
 
 yaz_proxy_SOURCES=yaz-proxy-main.cpp
 

-LDADD=libyaz++.la $(YAZLALIB)
+LDADD=libyazcpp.la $(YAZLALIB)

diff --git a/zoom/Makefile.am b/zoom/Makefile.am
index 55f2889..1cf2b93 100644 (file)
--- a/zoom/Makefile.am
+++ b/zoom/Makefile.am
@@ -1,8 +1,8 @@
-# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.4 2002-10-09 09:19:55 adam Exp $
+# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.5 2002-10-09 16:17:26 adam Exp $

 
 AM_CXXFLAGS= $(YAZINC) 
 
 
 AM_CXXFLAGS= $(YAZINC) 
 

-lib_LTLIBRARIES = libzoomcpp.la
+noinst_LTLIBRARIES = libzoomcpp.la

 LDADD=libzoomcpp.la $(YAZLALIB)
 
 mirk_XXX_SOURCES = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp
 LDADD=libzoomcpp.la $(YAZLALIB)
 
 mirk_XXX_SOURCES = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp