From: Adam Dickmeiss Date: Wed, 7 Jan 1998 12:59:27 +0000 (+0000) Subject: Updated Makefiles so that there is no dependancy on ELIBS. X-Git-Tag: YAZ.1.8~543 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=1ca987b3a11334e4b0ad24c372162f5ecbf28847 Updated Makefiles so that there is no dependancy on ELIBS. --- diff --git a/CHANGELOG b/CHANGELOG index 8995a4c..2d1a63a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -52,7 +52,7 @@ calling this. Added NT Services interface for the the Z39.50 (statserv) Server. Refer to the ztest.c source on the usage. -Windows 95/NT port using MSV5.0. Project files are included in the +Windows 95/NT port using MSVC5.0. Project files are included in the distribution. * Defined new 'global' handle for the retrieval (data1) system. The diff --git a/README b/README index dd7207a..054c9bd 100644 --- a/README +++ b/README @@ -1,16 +1,16 @@ - * Copyright (C) 1995-1997, Index Data. + * Copyright (C) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss Compilation and installation for YAZ - $Id: README,v 1.18 1997-09-18 08:47:17 adam Exp $ + $Id: README,v 1.19 1998-01-07 12:59:27 adam Exp $ The primary output of the source here is the lib/libyaz.a library, which contains support functions for implementing the server or client role of Z39.50/SR. -Windows programmers: refer to the file MSVC.txt which describes +Windows programmers: refer to the file windows.txt which describes how to compile the software using Microsoft Visual C++. Two test-programs of interest are generated when you type 'make' at @@ -115,8 +115,8 @@ makelib - This is a simple utility that gathers the libraries from the lib - The libraries. Primarily libyaz.a. -To get more information or assistance, send mail to yaz-help@index.ping.dk. +To get more information or assistance, send mail to yaz-help@indexdata.dk. We maintain a mailing-list for the purpose of announcing new versions of the software, bug-reports, discussion etc. You can sign up by sending -mail to yaz-request@index.ping.dk. +mail to yaz-request@indexdata.dk. diff --git a/client/Makefile b/client/Makefile index 75c6ea3..d1edd80 100644 --- a/client/Makefile +++ b/client/Makefile @@ -1,7 +1,7 @@ -# Copyright (C) 1994, Index Data I/S +# Copyright (C) 1995-1998, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.13 1997-09-22 12:33:41 adam Exp $ +# $Id: Makefile,v 1.14 1998-01-07 12:59:27 adam Exp $ LIBDIR=../lib @@ -12,7 +12,7 @@ INCLUDE=-I../include -I. -I../../xtimosi/src LIBINCLUDE=-L$(LIBDIR) DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1 LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \ - $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a $(ELIBS) + $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a CPP=$(CC) -E PROG=client PROGO=client.o @@ -20,10 +20,7 @@ PROGO=client.o all: $(PROG) $(PROG): $(LIB) $(PROGO) $(LIBS) - $(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS) - -qparser: qparser.o - $(CC) $(CFLAGS) $(LIBINCLUDE) -o qparser qparser.o $(LIBS) + $(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS) $(ELIBS) alll: diff --git a/server/Makefile b/server/Makefile index 34c4356..f930e94 100644 --- a/server/Makefile +++ b/server/Makefile @@ -1,7 +1,7 @@ -# Copyright (C) 1994-1997, Index Data I/S +# Copyright (C) 1994-1998, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.33 1997-09-17 12:10:39 adam Exp $ +# $Id: Makefile,v 1.34 1998-01-07 12:59:27 adam Exp $ LIBDIR=../lib @@ -12,8 +12,6 @@ INCLUDE=-I../include -I. -I../../xtimosi/src LIBINCLUDE=-L$(LIBDIR) DEFS=$(INCLUDE) $(CDEFS) LIB=$(LIBDIR)/libserver.a -LIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \ -$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a $(ELIBS) PO = eventl.o seshigh.o statserv.o requestq.o CPP=$(CC) -E RANLIB=ranlib diff --git a/windows.txt b/windows.txt new file mode 100644 index 0000000..4c7f1fb --- /dev/null +++ b/windows.txt @@ -0,0 +1,46 @@ + +YAZ Compilation guidelines for winNT/95. + $Id: windows.txt,v 1.1 1998-01-07 12:59:27 adam Exp $ + +This distribution of YAZ was compiled with Visual C++ 5.0. +The workspace file, yaz.dsw, is located in the top-level directory. + +It includes 4 sub-projects: + yaz.dsp + Builds yaz.dll. This DLL includes the source in all + sub directories except for 'server', 'client' and + 'ztest'. To export public functions the header files + includes the modifier YAZ_EXPORT which is defined in + yconfig.h. The value of this modifier, + __declspec(dllexport), probably only works with VC. + + client/client.dsp + Builds client.exe as a console application. It links + with the import library yaz.lib. This application + searches for yaz.dll during runtime. + + server/server.dsp + Builds the library, server.lib, which includes the + source from 'server'. Unlike the UNIX version, the + server library is multi-threaded. + + ztest/ztest.dsp + Builds ztest.exe as a console application. It links + with the import library yaz.lib and the regular library + server.lib. When running ztest make sure it is able to + find the record test files dummy-records, dummy-grs, + and dummy-words in the current directory. + + As an option ztest may be installed as an NT service + (not Windows 95). Use 'ztest -install ' to + install it and 'ztest -remove ' to remove it + again. Since NT runs the service program in some weird + directory, such as \winnt\system32, it's probably a good + idea to use the option '-w' to change to some other + directory. For example + + ztest -install -w d:\proj\yaz\ztest -l ztest.out tcp:@:210 + + which specifies both working directory and a log file, so + you can see what's going on. + diff --git a/ztest/Makefile b/ztest/Makefile index d3300da..646742a 100644 --- a/ztest/Makefile +++ b/ztest/Makefile @@ -1,7 +1,7 @@ -# Copyright (C) 1995-1997, Index Data I/S +# Copyright (C) 1995-1998, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.3 1997-09-22 12:33:41 adam Exp $ +# $Id: Makefile,v 1.4 1998-01-07 12:59:27 adam Exp $ LIBDIR=../lib @@ -13,7 +13,7 @@ LIBINCLUDE=-L$(LIBDIR) DEFS=$(INCLUDE) $(CDEFS) LIB=$(LIBDIR)/libserver.a LIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \ -$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a $(ELIBS) +$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a CPP=$(CC) -E PROG=ztest PROGO=ztest.o read-grs.o @@ -22,7 +22,7 @@ RANLIB=ranlib all: $(PROG) $(PROG): $(LIB) $(PROGO) $(LIBS) - $(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS) + $(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS) $(ELIBS) alll: