From 34203146338c5f6c89774bde4caad110345405bd Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 18 Feb 2003 10:37:08 +0000 Subject: [PATCH] Use LIBS instead of XML2_LIBS for Makefiles --- client/Makefile.am | 4 ++-- configure.in | 3 ++- debian/changelog | 6 +++++ debian/control | 2 +- debian/rules | 2 +- doc/Makefile.am | 63 ++++++++++++++++++++++++++++++++++++++++------------ lib/Makefile.am | 4 ++-- server/Makefile.am | 2 +- yaz-config.in | 4 ++-- zoom/Makefile.am | 4 ++-- ztest/Makefile.am | 6 ++--- zutil/Makefile.am | 4 ++-- 12 files changed, 73 insertions(+), 31 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index d26dc49..d8ea521 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,6 +1,6 @@ ## Copyright (C) 1995-2000, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.16 2002-04-15 09:44:41 adam Exp $ +## $Id: Makefile.am,v 1.17 2003-02-18 10:37:08 adam Exp $ if ISSSL extra=yaz-client-ssl @@ -14,6 +14,6 @@ yaz_client_SOURCES=client.c admin.c admin.h tabcomplete.c tabcomplete.h yaz_client_ssl_SOURCES=$(yaz_client_SOURCES) yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS) -yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) $(SSL_LIBS) +yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) AM_CPPFLAGS=-I$(top_srcdir)/include diff --git a/configure.in b/configure.in index 964d140..4555068 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1994-2003 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.106 2003-02-17 22:35:47 adam Exp $ +dnl $Id: configure.in,v 1.107 2003-02-18 10:37:08 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.9.3) dnl @@ -370,6 +370,7 @@ if test "$xml2dir" != "no"; then AC_MSG_CHECKING(for libXML2) if test -x $xml2dir/bin/xml2-config; then XML2_LIBS=`$xml2dir/bin/xml2-config --libs` + LIBS="$XML2_LIBS $LIBS" XML2_CFLAGS=`$xml2dir/bin/xml2-config --cflags` XML2_VER=`$xml2dir/bin/xml2-config --version` AC_MSG_RESULT($XML2_VER) diff --git a/debian/changelog b/debian/changelog index d9d494c..138750e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yaz (1.9.3-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Tue, 18 Feb 2003 09:11:40 +0100 + yaz (1.9.2-2) unstable; urgency=low * Fix element set for piggyback in ZOOM. diff --git a/debian/control b/debian/control index f8ce711..2d18b0f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: yaz Standards-Version: 3.5.7.0 Maintainer: Adam Dickmeiss Priority: extra -Build-Depends: docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex +Build-Depends: docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,libxml2-dev Package: yaz-runtime Section: libs diff --git a/debian/rules b/debian/rules index 66271f6..5c790fd 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ export DH_COMPAT=2 YAZ_WITH_SSL?=1 -CONFIG_FLAGS=--without-gsoap --enable-static --enable-shared --enable-tcpd --prefix=/usr +CONFIG_FLAGS=--with-xml2=/usr --enable-static --enable-shared --enable-tcpd --prefix=/usr # Enable parallel builds if CONCURRENCY_LEVEL is set ifdef CONCURRENCY_LEVEL diff --git a/doc/Makefile.am b/doc/Makefile.am index 1670e45..cc736db 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.36 2002-11-08 12:27:00 adam Exp $ +## $Id: Makefile.am,v 1.37 2003-02-18 10:37:08 adam Exp $ docdir=$(datadir)/doc/@PACKAGE@ @@ -7,19 +7,54 @@ XMLFILES=yaz.xml.in introduction.xml installation.xml indexdata.xml \ future.xml client.xml zoom.xml credits.xml ztest-options.xml \ yaz-client-commands.xml -HTMLFILES= asn.external.html asn.html asn.oid.html asn.pdu.html \ - asn.preparing.html client.commands.html client.html client.invoking.html \ - client.searching.html comstack.addresses.html comstack.client.html \ - comstack.common.html comstack.diagnostics.html comstack.html \ - comstack.introduction.html comstack.server.html comstack.summary.html \ - credits.html future.html indexdata.html installation.html \ - installation.unix.html installation.win32.html introduction.html \ - license.html license.other.html odr.debugging.html odr.html \ - odr.programming.html odr.use.html server.backendfunctions.html \ - server.backend.html server.frontend.html server.html \ - server.invocation.html server.main.html tools.html tools.nmem.html \ - tools.oid.html yaz.html zoom.events.html zoom.html zoom.options.html \ - zoom.query.html zoom.records.html zoom.resultsets.html zoom.scan.html +HTMLFILES = \ +asn.external.html \ +asn.html \ +asn.oid.html \ +asn.pdu.html \ +asn.preparing.html \ +client.commands.html \ +client.html \ +client.invoking.html \ +client.searching.html \ +comstack.addresses.html \ +comstack.client.html \ +comstack.common.html \ +comstack.diagnostics.html \ +comstack.html \ +comstack.introduction.html \ +comstack.server.html \ +comstack.summary.html \ +credits.html \ +future.html \ +indexdata.html \ +installation.html \ +installation.unix.html \ +installation.win32.html \ +introduction.html \ +license.html \ +license.other.html \ +odr.debugging.html \ +odr.html \ +odr.programming.html \ +odr.use.html \ +server.backendfunctions.html \ +server.backend.html \ +server.frontend.html \ +server.html \ +server.invocation.html \ +server.main.html \ +tools.html \ +tools.nmem.html \ +tools.oid.html \ +yaz.html \ +zoom.events.html \ +zoom.html \ +zoom.options.html \ +zoom.query.html \ +zoom.records.html \ +zoom.resultsets.html \ +zoom.scan.html MANFILES=yaz-client.1 yaz-client-ssl.1 yaz-ztest.8 \ yaz-ztest-ssl.8 yaz-config.1 yaz.7 zoomsh.1 diff --git a/lib/Makefile.am b/lib/Makefile.am index 549ce23..05c344d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.26 2003-02-12 15:06:43 adam Exp $ +## $Id: Makefile.am,v 1.27 2003-02-18 10:37:08 adam Exp $ if ISTHR extra=libyazthread.la @@ -8,7 +8,7 @@ if ISSSL ssllib=libyazssl.la endif -LDFLAGS=-version-info 1:0:0 +LDFLAGS=-version-info 2:0:0 bin_SCRIPTS = yaz-config diff --git a/server/Makefile.am b/server/Makefile.am index 0cae60c..70dec76 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -7,4 +7,4 @@ libserver_la_SOURCES = eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \ EXTRA_DIST=service.c -AM_CPPFLAGS=-I$(top_srcdir)/include $(XSLT_CFLAGS) -DDOCDIR=\"$(datadir)/doc/$(PACKAGE)\" +AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) -DDOCDIR=\"$(datadir)/doc/$(PACKAGE)\" diff --git a/yaz-config.in b/yaz-config.in index 7824d02..0f7c7e4 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: yaz-config.in,v 1.16 2003-02-12 15:06:42 adam Exp $ +# $Id: yaz-config.in,v 1.17 2003-02-18 10:37:08 adam Exp $ yazprefix=@prefix@ yaz_echo_cflags=no yaz_echo_libs=no @@ -10,7 +10,7 @@ yaz_echo_comp=no yaz_src_root=@YAZ_SRC_ROOT@ yaz_build_root=@YAZ_BUILD_ROOT@ -yazextralibs="@XSLT_LIB@ @LIBS@" +yazextralibs="@LIBS@" YAZVERSION=@VERSION@ usage() diff --git a/zoom/Makefile.am b/zoom/Makefile.am index f0422ab..be36a81 100644 --- a/zoom/Makefile.am +++ b/zoom/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.9 2003-02-17 22:35:48 adam Exp $ +## $Id: Makefile.am,v 1.10 2003-02-18 10:37:08 adam Exp $ ## Copyright (C) 2001, Index Data AM_CPPFLAGS = -I$(top_srcdir)/include @@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include noinst_PROGRAMS = zoomtst1 zoomtst2 zoomtst3 zoomtst4 zoomtst5 zoomtst6 zoomtst7 zoomtst8 bin_PROGRAMS = zoomsh -LDADD = ../lib/libyazmalloc.la ../lib/libyaz.la $(XML2_LIBS) $(READLINE_LIBS) +LDADD = ../lib/libyazmalloc.la ../lib/libyaz.la $(READLINE_LIBS) zoomtst1_SOURCES = zoomtst1.c zoomtst2_SOURCES = zoomtst2.c diff --git a/ztest/Makefile.am b/ztest/Makefile.am index 14b17f7..21b2e8a 100644 --- a/ztest/Makefile.am +++ b/ztest/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.13 2003-02-17 22:35:48 adam Exp $ +## $Id: Makefile.am,v 1.14 2003-02-18 10:37:08 adam Exp $ if ISSSL sslbin=yaz-ztest-ssl @@ -16,10 +16,10 @@ extra=../lib/libyazthread.la endif yaz_ztest_LDADD=$(extra) ../lib/libyaz.la \ - $(XML2_LIBS) $(LIBTHREAD) + $(LIBTHREAD) yaz_ztest_ssl_LDADD=$(extra) ../lib/libyazssl.la ../lib/libyaz.la \ - $(SSL_LIBS) $(XML2_LIBS) $(LIBTHREAD) + $(SSL_LIBS) $(LIBTHREAD) AM_CFLAGS=@CFLAGSTHREADS@ diff --git a/zutil/Makefile.am b/zutil/Makefile.am index 503e94d..907e331 100644 --- a/zutil/Makefile.am +++ b/zutil/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.16 2003-02-17 22:35:48 adam Exp $ +## $Id: Makefile.am,v 1.17 2003-02-18 10:37:09 adam Exp $ noinst_LTLIBRARIES = libzutil.la AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/srw $(XML2_CFLAGS) @@ -7,7 +7,7 @@ libzutil_la_SOURCES = zget.c yaz-ccl.c diagbib1.c logrpn.c \ otherinfo.c pquery.c sortspec.c z3950oid.c charneg.c \ zoom-c.c zoom-opt.c zoom-p.h grs1disp.c zgdu.c soap.c srw.c -srwtst_LDADD = ../odr/libodr.la libzutil.la $(XML2_LIBS) ../util/libutil.la +srwtst_LDADD = ../odr/libodr.la libzutil.la ../util/libutil.la srwtst_SOURCES = srwtst.c noinst_PROGRAMS = srwtst -- 1.7.10.4