From: Adam Dickmeiss Date: Mon, 19 Nov 2001 20:43:39 +0000 (+0000) Subject: No "copy" of source for thread/malloc libraries. X-Git-Tag: YAZ.1.8.4~20 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=598c8178dc444f596d5bd6111b4fed52745cad5e No "copy" of source for thread/malloc libraries. --- diff --git a/CHANGELOG b/CHANGELOG index 73db505..4af0339 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ Possible compatibility problems with earlier versions marked with '*'. +--- 1.8.4 2001/XX/XX + --- 1.8.3 2001/11/19 YAZ client enables named result sets only if target supports it. diff --git a/README b/README index fb10bc5..093c627 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -YAZ toolkit - $Id: README,v 1.38 2001-10-25 12:29:35 adam Exp $ +YAZ toolkit - $Id: README,v 1.39 2001-11-19 20:43:39 adam Exp $ Copyright (C) 1995-2001, Index Data ApS. See the file LICENSE for details. @@ -38,7 +38,7 @@ z39.50 codecs for the Z39.50 protocol. This module does the same job zutil This module implements a collection of Z39.50 utilities, such as query parsing, etc. -ill codesc for the ISO ILL protocol. +ill codecs for the ISO ILL protocol. comstack This module implements the transport transparency stack (COMSTACK). The comstack implements a generic interface diff --git a/configure.in b/configure.in index 51392a8..be3377d 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2001 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.55 2001-11-18 21:14:22 adam Exp $ +dnl $Id: configure.in,v 1.56 2001-11-19 20:43:39 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 1.8.3) +AM_INIT_AUTOMAKE(yaz, 1.8.4) dnl AC_SUBST(READLINE_LIBS) dnl ------ Checking programs diff --git a/debian/rules b/debian/rules index 595e951..0e96b0a 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ YAZSRCDIR=$(shell pwd) YAZ_VERSION=$(shell date -r$(YAZSRCDIR)/CVS +"CVS%Y%m%d") else YAZSRCDIR=$(shell pwd) -YAZ_VERSION=1.8.3 +YAZ_VERSION=1.8.4 endif configure: stamp-configure diff --git a/doc/yaz.xml b/doc/yaz.xml index bbc32d5..d1484ce 100644 --- a/doc/yaz.xml +++ b/doc/yaz.xml @@ -22,7 +22,7 @@ COMSTACK"> ZOOM"> ]> - + YAZ User's Guide and Reference @@ -40,7 +40,7 @@ This document is the programmer's guide and reference to the &yaz; - package version 1.8.3. &yaz; is a compact toolkit that provides + package version 1.8.4. &yaz; is a compact toolkit that provides access to the Z39.50 protocol, as well as a set of higher-level tools for implementing the server and client roles, respectively. The documentation can be used on its own, or as a reference when diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h index b38b77c..aefa1d4 100644 --- a/include/yaz/yaz-version.h +++ b/include/yaz/yaz-version.h @@ -1,11 +1,11 @@ /* * Current software version. * - * $Id: yaz-version.h,v 1.10 2001-11-18 21:14:23 adam Exp $ + * $Id: yaz-version.h,v 1.11 2001-11-19 20:43:39 adam Exp $ */ #ifndef YAZ_VERSION -#define YAZ_VERSION "1.8.3" +#define YAZ_VERSION "1.8.4" #include #ifdef WIN32 diff --git a/lib/Makefile.am b/lib/Makefile.am index b54511c..5fe0a9c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,9 +1,13 @@ -## $Id: Makefile.am,v 1.17 2001-11-19 09:16:37 adam Exp $ +## $Id: Makefile.am,v 1.18 2001-11-19 20:43:39 adam Exp $ if ISTHR extra=libyazthread.la endif +LDFLAGS=-version-info 1:0:0 + +bin_SCRIPTS = yaz-config + lib_LTLIBRARIES = libyaz.la $(extra) libyazmalloc.la # If the line below is omitted the LINK variable is @@ -13,27 +17,40 @@ EXTRA_libyaz_la_SOURCES=x.c # No real sources libyaz_la_SOURCES= -libyazthread_la_SOURCES=nmem.c statserv.c eventl.c +libyazthread_la_LIBADD=nmem.lo statserv.lo eventl.lo +libyazthread_la_SOURCES= -libyazmalloc_la_SOURCES=xmalloc.c +libyazmalloc_la_LIBADD=xmalloc.lo +libyazmalloc_la_SOURCES= -$(srcdir)/nmem.c: $(top_srcdir)/util/nmem.c - cp $(top_srcdir)/util/nmem.c $(srcdir) +THREADED_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@ -$(srcdir)/statserv.c: $(top_srcdir)/server/statserv.c - cp $(top_srcdir)/server/statserv.c $(srcdir) +XMALLOC_FLAGS = -DTRACE_XMALLOC=2 -I$(top_srcdir)/include -$(srcdir)/eventl.c: $(top_srcdir)/server/eventl.c - cp $(top_srcdir)/server/eventl.c $(srcdir) +nmem.lo: $(top_srcdir)/util/nmem.c + $(LTCOMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/util/nmem.c -$(srcdir)/xmalloc.c: $(top_srcdir)/util/xmalloc.c - cp $(top_srcdir)/util/xmalloc.c $(srcdir) +nmem.o: $(top_srcdir)/util/nmem.c + $(COMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/util/nmem.c -LDFLAGS=-version-info 1:0:0 +statserv.lo: $(top_srcdir)/server/statserv.c + $(LTCOMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/statserv.c -AM_CFLAGS=-DTRACE_XMALLOC=2 -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@ +statserv.o: $(top_srcdir)/server/statserv.c + $(COMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/statserv.c + +eventl.lo: $(top_srcdir)/server/eventl.c + $(LTCOMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/eventl.c + +eventl.o: $(top_srcdir)/server/eventl.c + $(COMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/eventl.c + +xmalloc.lo: $(top_srcdir)/util/xmalloc.c + $(LTCOMPILE) $(XMALLOC_FLAGS) -c $(top_srcdir)/util/xmalloc.c + +xmalloc.o: $(top_srcdir)/util/xmalloc.c + $(COMPILE) $(XMALLOC_FLAGS) -c $(top_srcdir)/util/xmalloc.c -bin_SCRIPTS = yaz-config libyaz_la_LIBADD=../odr/libodr.la \ ../comstack/libcomstack.la ../server/libserver.la \ diff --git a/win/yaz.rc b/win/yaz.rc index f2d3532..2df1143 100644 --- a/win/yaz.rc +++ b/win/yaz.rc @@ -54,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,3,0 - PRODUCTVERSION 1,8,3,0 + FILEVERSION 1,8,4,0 + PRODUCTVERSION 1,8,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,14 +73,14 @@ BEGIN VALUE "Comments", "Z39.50 C Library\0" VALUE "CompanyName", "Index Data\0" VALUE "FileDescription", "YAZ Toolkit\0" - VALUE "FileVersion", "1, 8, 3, 0\0" + VALUE "FileVersion", "1, 8, 4, 0\0" VALUE "InternalName", "YAZ\0" VALUE "LegalCopyright", "Copyright © 1996-2001 Index Data\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "yaz.rc\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Index Data YAZ Toolkit\0" - VALUE "ProductVersion", "1, 8, 3, 0\0" + VALUE "ProductVersion", "1, 8, 4, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/yaz.spec b/yaz.spec index 1e1e067..a6ebcf7 100644 --- a/yaz.spec +++ b/yaz.spec @@ -1,5 +1,5 @@ Name: yaz -Version: 1.8.3 +Version: 1.8.4 Release: 1 Copyright: YAZ License Group: Development/Libraries