From b8248fc2b2eb866a23a677135deb4633cb1f3322 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 9 Oct 2002 09:07:10 +0000 Subject: [PATCH] Change the ZOOM code to generate and use "zoom.h" rather than "zoom++.h" so that you don't have to #include . Also, tweak the in-progress documentation accordingly. --- doc/zoom.xml | 4 ++-- zoom/.cvsignore | 7 ++++++- zoom/Makefile.am | 8 ++++---- zoom/README | 4 ++-- zoom/zclient.cpp | 4 ++-- zoom/zconn.cpp | 4 ++-- zoom/zexcept.cpp | 4 ++-- zoom/zquery.cpp | 4 ++-- zoom/zrec.cpp | 4 ++-- zoom/zrs.cpp | 4 ++-- 10 files changed, 26 insertions(+), 21 deletions(-) diff --git a/doc/zoom.xml b/doc/zoom.xml index cc4485e..709a295 100644 --- a/doc/zoom.xml +++ b/doc/zoom.xml @@ -1,5 +1,5 @@ - + ZOOM-C++ @@ -29,7 +29,7 @@ from the Library of Congress's Z39.50 server: #include <iostream> - #include <yaz++/zoom++.h> + #include <yaz++/zoom.h> using namespace ZOOM; diff --git a/zoom/.cvsignore b/zoom/.cvsignore index e055020..ab69d1d 100644 --- a/zoom/.cvsignore +++ b/zoom/.cvsignore @@ -1,4 +1,9 @@ +.deps +.libs Makefile Makefile.in interface.h -zoom++.h +zoom.h +libzoomcpp.la +zclient +*.lo diff --git a/zoom/Makefile.am b/zoom/Makefile.am index b9290ff..e9057ab 100644 --- a/zoom/Makefile.am +++ b/zoom/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.2 2002-10-08 23:53:55 mike Exp $ +# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.3 2002-10-09 09:07:10 mike Exp $ AM_CXXFLAGS= $(YAZINC) @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libzoomcpp.la LDADD=libzoomcpp.la $(YAZLALIB) mirk_XXX_SOURCES = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp -libzoomcpp_la_SOURCES = $(mirk_XXX_SOURCES) zoom++.h interface.h +libzoomcpp_la_SOURCES = $(mirk_XXX_SOURCES) zoom.h interface.h noinst_PROGRAMS = zclient @@ -19,9 +19,9 @@ all: interface.h zclient test: zclient ./zclient bagel.indexdata.dk 210 gils '@and mineral epicenter' -$(mirk_XXX_SOURCES): zoom++.h +$(mirk_XXX_SOURCES): zoom.h -zoom++.h: master-header +zoom.h: master-header rm -f $@ sed 's/^* / /; s/^*/ /' $< > $@ chmod -w $@ diff --git a/zoom/README b/zoom/README index c5b0366..581c7be 100644 --- a/zoom/README +++ b/zoom/README @@ -17,9 +17,9 @@ by asterisks ("*"). So we have: interface.h The read-only, automatically-generated file that can be considered a formal specification of the ZOOM C++ interface. - zoom++.h The read-only, automatically-generated file + zoom.h The read-only, automatically-generated file that is actually used in the build process, - and ought quite possibly to be moved into + and ultimately installed into ../include/yaz++/zoom.h Documentation (in DocBook format) is in "../doc/zoom.xml" diff --git a/zoom/zclient.cpp b/zoom/zclient.cpp index 16a2ae3..53e2f9d 100644 --- a/zoom/zclient.cpp +++ b/zoom/zclient.cpp @@ -1,10 +1,10 @@ -// $Header: /home/cvsroot/yaz++/zoom/zclient.cpp,v 1.3 2002-10-08 23:55:52 mike Exp $ +// $Header: /home/cvsroot/yaz++/zoom/zclient.cpp,v 1.4 2002-10-09 09:07:10 mike Exp $ // Simple sample client #include // for atoi() #include -#include "zoom++.h" +#include "zoom.h" int main(int argc, char **argv) diff --git a/zoom/zconn.cpp b/zoom/zconn.cpp index 8aad4ab..9b02a9b 100644 --- a/zoom/zconn.cpp +++ b/zoom/zconn.cpp @@ -1,8 +1,8 @@ -// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.2 2002-08-08 16:06:08 mike Exp $ +// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.3 2002-10-09 09:07:10 mike Exp $ // Z39.50 Connection class -#include "zoom++.h" +#include "zoom.h" namespace ZOOM { diff --git a/zoom/zexcept.cpp b/zoom/zexcept.cpp index e37edfc..bb8743a 100644 --- a/zoom/zexcept.cpp +++ b/zoom/zexcept.cpp @@ -1,4 +1,4 @@ -// $Header: /home/cvsroot/yaz++/zoom/zexcept.cpp,v 1.2 2002-10-08 23:57:29 mike Exp $ +// $Header: /home/cvsroot/yaz++/zoom/zexcept.cpp,v 1.3 2002-10-09 09:07:10 mike Exp $ // Z39.50 Exception classes @@ -6,7 +6,7 @@ #include // for strerror(), strlen(), strcpy() #include // for sprintf() #include -#include "zoom++.h" +#include "zoom.h" namespace ZOOM { diff --git a/zoom/zquery.cpp b/zoom/zquery.cpp index 602663f..154e3ce 100644 --- a/zoom/zquery.cpp +++ b/zoom/zquery.cpp @@ -1,8 +1,8 @@ -// $Header: /home/cvsroot/yaz++/zoom/zquery.cpp,v 1.2 2002-08-08 16:06:08 mike Exp $ +// $Header: /home/cvsroot/yaz++/zoom/zquery.cpp,v 1.3 2002-10-09 09:07:10 mike Exp $ // Z39.50 Query classes -#include "zoom++.h" +#include "zoom.h" namespace ZOOM { diff --git a/zoom/zrec.cpp b/zoom/zrec.cpp index 09dee2f..8537718 100644 --- a/zoom/zrec.cpp +++ b/zoom/zrec.cpp @@ -1,8 +1,8 @@ -// $Header: /home/cvsroot/yaz++/zoom/zrec.cpp,v 1.3 2002-08-08 16:14:26 mike Exp $ +// $Header: /home/cvsroot/yaz++/zoom/zrec.cpp,v 1.4 2002-10-09 09:07:10 mike Exp $ // Z39.50 Record class -#include "zoom++.h" +#include "zoom.h" #include // for yaz_matchstr() diff --git a/zoom/zrs.cpp b/zoom/zrs.cpp index 48e212c..3ccce51 100644 --- a/zoom/zrs.cpp +++ b/zoom/zrs.cpp @@ -1,8 +1,8 @@ -// $Header: /home/cvsroot/yaz++/zoom/zrs.cpp,v 1.2 2002-08-08 16:06:08 mike Exp $ +// $Header: /home/cvsroot/yaz++/zoom/zrs.cpp,v 1.3 2002-10-09 09:07:10 mike Exp $ // Z39.50 Result Set class -#include "zoom++.h" +#include "zoom.h" namespace ZOOM { -- 1.7.10.4