From: Adam Dickmeiss Date: Wed, 5 Apr 2000 09:49:35 +0000 (+0000) Subject: On Unix, zebra/z'mbol uses automake. X-Git-Tag: ZEBRA.1.1~89 X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=69da23537c6bb71ab948e079708bf8ea090de73f;p=idzebra-moved-to-github.git On Unix, zebra/z'mbol uses automake. --- diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..0d41f00 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,28 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:35 adam Exp $ + +AUTOMAKE_OPTIONS=foreign + +EXTRA_DIST= README CHANGELOG + +if ISZMBOL +SUBDIRS=util bfile dfa dict isams isamc isam rset recctrl tab index test +else +SUBDIRS=util bfile dfa dict isams rset recctrl tab index test +endif +DIST_SUBDIRS=$(SUBDIRS) include doc + +SPEC_FILE=$(PACKAGE).spec + +dist-hook: + cd doc; make + cp $(srcdir)/LICENSE* $(distdir) + mkdir $(distdir)/win + for i in $(srcdir)/win/*; do \ + if test -f $$i; then \ + cp $$i $(distdir)/win; \ + fi; \ + done + +rpm: $(PACKAGE)-$(VERSION).tar.gz + cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES + rpm -ba $(SPEC_FILE) diff --git a/Makefile.in b/Makefile.in index 46b10eb..e75cf9b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,85 +1,352 @@ -# Copyright (C) 1994-1999, Index Data -# All rights reserved. -# $Id: Makefile.in,v 1.10 1999-12-11 21:39:35 adam Exp $ - -SHELL=/bin/sh -MAKE=make -RANLIB=@RANLIB@ -CC=@CC@ -CPP=@CPP@ -CDEFS=@DEFS@ @ODEFS@ - -# Where are Yaz libraries located? -YAZLIB=@YAZLIB@ -# Where are Yaz header files located? -YAZINC=@YAZINC@ -# If Yaz is compiled with mosi support uncomment and specify. -#OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a - -# Tcl include files and libraries -TCL_INCLUDE=@TCL_INCLUDE@ -TCL_LIB=@TCL_LIB@ - -# Some systems have seperate socket libraries -LIBS=@LIBS@ - -prefix=@prefix@ -exec_prefix=@exec_prefix@ - -INSTALL=@INSTALL@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_DATA=@INSTALL_DATA@ - -BUILD=@build_root@ -BINDIR=$(exec_prefix)/bin -# Public libraries and header files -LIBDIR=$(exec_prefix)/lib -INCDIR=$(prefix)/include -# Misc tables, etc. -ZEBRADIR=$(prefix)/lib/@PROGPREFIX@ -ZEBRATAB=$(prefix)/lib/@PROGPREFIX@/tab -ZEBRADOC=$(prefix)/lib/@PROGPREFIX@/doc - -SUBDIR=@SUBDIR@ - -all: - for i in $(SUBDIR); do cd $$i; if $(MAKE) OSILIB="$(OSILIB)" YAZLIB="$(YAZLIB)" YAZINC="$(YAZINC)" RANLIB="$(RANLIB)" CDEFS="$(CDEFS)" LIBS="$(LIBS)" CFLAGS="$(CFLAGS)" CC="$(CC)"; then cd ..; else exit 1; fi; done - -dep depend: - for i in $(SUBDIR); do cd $$i; if $(MAKE) CPP="$(CPP)" CDEFS="$(CDEFS)" YAZINC="$(YAZINC)" depend; then cd ..; else exit 1; fi; done - -clean: - for i in $(SUBDIR); do (cd $$i; $(MAKE) clean); done - rm -f lib/*.a - -cleanup: - rm -f `find $(SUBDIR) -name "*.[oa]" -print` - rm -f `find $(SUBDIR) -name "core" -print` - rm -f `find $(SUBDIR) -name "errlist" -print` - rm -f `find $(SUBDIR) -name "a.out" -print` - -cleandepend: - for i in $(SUBDIR); do (cd $$i; \ - if sed '/^#Depend/q' Makefile.tmp; then \ - mv -f Makefile.tmp Makefile; fi; rm -f .depend); done - -install: all - $(INSTALL) -d $(BUILD)$(BINDIR) - $(INSTALL_PROGRAM) bin/@PROGPREFIX@idx $(BUILD)$(BINDIR) - $(INSTALL_PROGRAM) bin/@PROGPREFIX@srv $(BUILD)$(BINDIR) - $(INSTALL) -d $(BUILD)$(ZEBRATAB) - @cd tab; for f in *; do \ - if [ -f $$f ]; then \ - $(INSTALL_DATA) $$f $(BUILD)$(ZEBRATAB); \ - fi; \ +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = . + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ + +AUTOMAKE_OPTIONS = foreign + +EXTRA_DIST = README CHANGELOG +@ISZMBOL_TRUE@SUBDIRS = util bfile dfa dict isams isamc isam rset recctrl tab index test +@ISZMBOL_FALSE@SUBDIRS = util bfile dfa dict isams rset recctrl tab index test +DIST_SUBDIRS = $(SUBDIRS) include doc + +SPEC_FILE = $(PACKAGE).spec +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +DIST_COMMON = README Makefile.am Makefile.in TODO aclocal.m4 configure \ +configure.in install-sh missing mkinstalldirs + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +$(ACLOCAL_M4): configure.in + cd $(srcdir) && $(ACLOCAL) + +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + -rm -rf $(distdir) + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist + -rm -rf $(distdir) + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" +dist: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +dist-all: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) + -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done - $(INSTALL) -d $(BUILD)$(ZEBRADOC) - @cd doc; for f in *; do \ - if [ -f $$f ]; then \ - $(INSTALL_DATA) $$f $(BUILD)$(ZEBRADOC); \ + for subdir in $(DIST_SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook +info-am: +info: info-recursive +dvi-am: +dvi: dvi-recursive +check-am: all-am +check: check-recursive +installcheck-am: +installcheck: installcheck-recursive +install-exec-am: +install-exec: install-exec-recursive + +install-data-am: +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: +uninstall: uninstall-recursive +all-am: Makefile +all-redirect: all-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: installdirs-recursive +installdirs-am: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-tags mostlyclean-generic + +mostlyclean: mostlyclean-recursive + +clean-am: clean-tags clean-generic mostlyclean-am + +clean: clean-recursive + +distclean-am: distclean-tags distclean-generic clean-am + +distclean: distclean-recursive + -rm -f config.status + +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive + -rm -f config.status + +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +dist-hook: + cd doc; make + cp $(srcdir)/LICENSE* $(distdir) + mkdir $(distdir)/win + for i in $(srcdir)/win/*; do \ + if test -f $$i; then \ + cp $$i $(distdir)/win; \ fi; \ done -wc: - wc `find . -name '*.[ch]'` +rpm: $(PACKAGE)-$(VERSION).tar.gz + cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES + rpm -ba $(SPEC_FILE) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/bfile/Makefile.am b/bfile/Makefile.am new file mode 100644 index 0000000..9ecb102 --- /dev/null +++ b/bfile/Makefile.am @@ -0,0 +1,7 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:35 adam Exp $ Copyright (C) 1994-1998, Index Data ApS +noinst_LIBRARIES = libbfile.a + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +libbfile_a_SOURCES = bfile.c mfile.c cfile.c commit.c cfile.h + diff --git a/bfile/Makefile.in b/bfile/Makefile.in index 80bfe1c..4988a9d 100644 --- a/bfile/Makefile.in +++ b/bfile/Makefile.in @@ -1,44 +1,303 @@ -# Copyright (C) 1994-1998, Index Data ApS -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.4 1999-11-30 13:48:03 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -TPROG=btest -DEFS=$(INCLUDE) $(CDEFS) -LIB=../lib/bfile.a -PO = bfile.o mfile.o cfile.o commit.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -$(TPROG): $(TPROG).o $(LIB) $(YAZLIB) - $(CC) -o $(TPROG) $(TPROG).o $(LIB) $(YAZLIB) +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +DESTDIR = -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -clean: - rm -f *.[oa] $(TPROG) core mon.out gmon.out errlist +top_builddir = .. -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ -#Depend --- DOT NOT DELETE THIS LINE +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ + +noinst_LIBRARIES = libbfile.a + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +libbfile_a_SOURCES = bfile.c mfile.c cfile.c commit.c cfile.h +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libbfile_a_LIBADD = +libbfile_a_OBJECTS = bfile.o mfile.o cfile.o commit.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/bfile.P .deps/cfile.P .deps/commit.P .deps/mfile.P +SOURCES = $(libbfile_a_SOURCES) +OBJECTS = $(libbfile_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu bfile/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libbfile.a: $(libbfile_a_OBJECTS) $(libbfile_a_DEPENDENCIES) + -rm -f libbfile.a + $(AR) cru libbfile.a $(libbfile_a_OBJECTS) $(libbfile_a_LIBADD) + $(RANLIB) libbfile.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = bfile + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu bfile/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/configure b/configure index d92e3db..aeb455e 100755 --- a/configure +++ b/configure @@ -12,8 +12,6 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --with-buildroot RPM Build root" -ac_help="$ac_help --with-yazconfig=DIR yaz-config in DIR (example /home/yaz-1.5)" ac_help="$ac_help --disable-threads disable threads" @@ -529,7 +527,390 @@ else fi +echo $ac_n "checking for package""... $ac_c" 1>&6 +echo "configure:532: checking for package" >&5 +if test -r ${srcdir}/LICENSE.zmbol; then + echo "$ac_t""Z'mbol" 1>&6 + PROGPREFIX=zmbol + cat >> confdefs.h <<\EOF +#define ZMBOL 1 +EOF + + ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# ./install, which can be erroneously created by make from ./install.sh. +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:571: checking for a BSD compatible install" >&5 +if test -z "$INSTALL"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_IFS" +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 +echo "configure:624: checking whether build environment is sane" >&5 +# Just in case +sleep 1 +echo timestamp > conftestfile +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftestfile` + fi + if test "$*" != "X $srcdir/configure conftestfile" \ + && test "$*" != "X conftestfile $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { echo "configure: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" 1>&2; exit 1; } + fi + + test "$2" = conftestfile + ) +then + # Ok. + : +else + { echo "configure: error: newly created file is older than distributed files! +Check your system clock" 1>&2; exit 1; } +fi +rm -f conftest* +echo "$ac_t""yes" 1>&6 +if test "$program_transform_name" = s,x,x,; then + program_transform_name= +else + # Double any \ or $. echo might interpret backslashes. + cat <<\EOF_SED > conftestsed +s,\\,\\\\,g; s,\$,$$,g +EOF_SED + program_transform_name="`echo $program_transform_name|sed -f conftestsed`" + rm -f conftestsed +fi +test "$program_prefix" != NONE && + program_transform_name="s,^,${program_prefix},; $program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" + +# sed with no file args requires a program. +test "$program_transform_name" = "" && program_transform_name="s,x,x," + +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:681: checking whether ${MAKE-make} sets \${MAKE}" >&5 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftestmake <<\EOF +all: + @echo 'ac_maketemp="${MAKE}"' +EOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes +else + eval ac_cv_prog_make_${ac_make}_set=no +fi +rm -f conftestmake +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$ac_t""yes" 1>&6 + SET_MAKE= +else + echo "$ac_t""no" 1>&6 + SET_MAKE="MAKE=${MAKE-make}" +fi + + +PACKAGE=zmbol + +VERSION=1.1 + +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then + { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } +fi +cat >> confdefs.h <> confdefs.h <&6 +echo "configure:727: checking for working aclocal" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (aclocal --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal + echo "$ac_t""found" 1>&6 +else + ACLOCAL="$missing_dir/missing aclocal" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +echo "configure:740: checking for working autoconf" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (autoconf --version) < /dev/null > /dev/null 2>&1; then + AUTOCONF=autoconf + echo "$ac_t""found" 1>&6 +else + AUTOCONF="$missing_dir/missing autoconf" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working automake""... $ac_c" 1>&6 +echo "configure:753: checking for working automake" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (automake --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake + echo "$ac_t""found" 1>&6 +else + AUTOMAKE="$missing_dir/missing automake" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +echo "configure:766: checking for working autoheader" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (autoheader --version) < /dev/null > /dev/null 2>&1; then + AUTOHEADER=autoheader + echo "$ac_t""found" 1>&6 +else + AUTOHEADER="$missing_dir/missing autoheader" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 +echo "configure:779: checking for working makeinfo" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (makeinfo --version) < /dev/null > /dev/null 2>&1; then + MAKEINFO=makeinfo + echo "$ac_t""found" 1>&6 +else + MAKEINFO="$missing_dir/missing makeinfo" + echo "$ac_t""missing" 1>&6 +fi + + + SUBLIBS="../rset/librset.a \ + ../dict/libdict.a \ + ../isams/libisams.a \ + ../isam/libisam.a \ + ../isamc/libisamc.a \ + ../recctrl/librecctrl.a \ + ../bfile/libbfile.a \ + ../dfa/libdfa.a \ + ../util/libutil.a" +else + echo "$ac_t""Zebra" 1>&6 + PROGPREFIX=zebra + cat >> confdefs.h <<\EOF +#define ZMBOL 0 +EOF + + +PACKAGE=zebra + +VERSION=1.1 + +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then + { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } +fi +cat >> confdefs.h <> confdefs.h <&6 +echo "configure:828: checking for working aclocal" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (aclocal --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal + echo "$ac_t""found" 1>&6 +else + ACLOCAL="$missing_dir/missing aclocal" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +echo "configure:841: checking for working autoconf" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (autoconf --version) < /dev/null > /dev/null 2>&1; then + AUTOCONF=autoconf + echo "$ac_t""found" 1>&6 +else + AUTOCONF="$missing_dir/missing autoconf" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working automake""... $ac_c" 1>&6 +echo "configure:854: checking for working automake" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (automake --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake + echo "$ac_t""found" 1>&6 +else + AUTOMAKE="$missing_dir/missing automake" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +echo "configure:867: checking for working autoheader" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (autoheader --version) < /dev/null > /dev/null 2>&1; then + AUTOHEADER=autoheader + echo "$ac_t""found" 1>&6 +else + AUTOHEADER="$missing_dir/missing autoheader" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 +echo "configure:880: checking for working makeinfo" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (makeinfo --version) < /dev/null > /dev/null 2>&1; then + MAKEINFO=makeinfo + echo "$ac_t""found" 1>&6 +else + MAKEINFO="$missing_dir/missing makeinfo" + echo "$ac_t""missing" 1>&6 +fi + + + SUBLIBS="../rset/librset.a ../dict/libdict.a ../isams/libisams.a \ + ../recctrl/librecctrl.a \ + ../bfile/libbfile.a ../dfa/libdfa.a \ + ../util/libutil.a" + if test ! -r ${srcdir}/isam; then + mkdir ${srcdir}/isam + touch ${srcdir}/isam/Makefile.in + fi + if test ! -r ${srcdir}/isamc; then + mkdir ${srcdir}/isamc + touch ${srcdir}/isamc/Makefile.in + fi +fi + + +if test $PACKAGE = zmbol; then + ISZMBOL_TRUE= + ISZMBOL_FALSE='#' +else + ISZMBOL_TRUE='#' + ISZMBOL_FALSE= +fi @@ -541,7 +922,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:545: checking for $ac_word" >&5 +echo "configure:926: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -571,7 +952,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:575: checking for $ac_word" >&5 +echo "configure:956: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -622,7 +1003,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:626: checking for $ac_word" >&5 +echo "configure:1007: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -654,7 +1035,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:658: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -665,12 +1046,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 669 "configure" +#line 1050 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -696,12 +1077,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:700: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1081: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:705: checking whether we are using GNU C" >&5 +echo "configure:1086: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -710,7 +1091,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -729,7 +1110,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:733: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1114: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -761,7 +1142,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:765: checking how to run the C preprocessor" >&5 +echo "configure:1146: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -776,13 +1157,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -793,13 +1174,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -810,13 +1191,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -840,25 +1221,6 @@ else fi echo "$ac_t""$CPP" 1>&6 -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -871,7 +1233,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:875: checking for a BSD compatible install" >&5 +echo "configure:1237: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -926,7 +1288,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:930: checking for $ac_word" >&5 +echo "configure:1292: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -953,21 +1315,6 @@ else echo "$ac_t""no" 1>&6 fi -if test ! -d lib; then - mkdir lib -fi -if test ! -d bin; then - mkdir bin -fi - -# Check whether --with-build-root or --without-build-root was given. -if test "${with_build_root+set}" = set; then - withval="$with_build_root" - build_root=$withval -else - build_root="" -fi - yazconfig=NONE yazpath=NONE # Check whether --with-yazconfig or --without-yazconfig was given. @@ -990,7 +1337,7 @@ else # Extract the first word of "yaz-config", so it can be a program name with args. set dummy yaz-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:994: checking for $ac_word" >&5 +echo "configure:1341: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_yazconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1026,7 +1373,7 @@ fi fi fi echo $ac_n "checking for YAZ""... $ac_c" 1>&6 -echo "configure:1030: checking for YAZ" >&5 +echo "configure:1377: checking for YAZ" >&5 if test -r $yazconfig; then . $yazconfig echo "$ac_t""$yazconfig" 1>&6 @@ -1043,7 +1390,7 @@ fi if test "$enable_threads" = "yes"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:1047: checking for main in -lpthread" >&5 +echo "configure:1394: checking for main in -lpthread" >&5 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1051,14 +1398,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1086,9 +1433,9 @@ else fi echo $ac_n "checking for working POSIX Threads""... $ac_c" 1>&6 -echo "configure:1090: checking for working POSIX Threads" >&5 +echo "configure:1437: checking for working POSIX Threads" >&5 cat > conftest.$ac_ext < int func(void *p) { return 0; } @@ -1099,7 +1446,7 @@ int main() { int r = pthread_create (&pthread_id, 0, func, 0); ; return 0; } EOF -if { (eval echo configure:1103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* thread_ok=yes else @@ -1139,7 +1486,7 @@ echo $ac_n "checking for prefix by $ac_c" 1>&6 # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1143: checking for $ac_word" >&5 +echo "configure:1490: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1180,7 +1527,7 @@ fi prefix=${saveprefix} fi echo $ac_n "checking for Tcl""... $ac_c" 1>&6 -echo "configure:1184: checking for Tcl" >&5 +echo "configure:1531: checking for Tcl" >&5 if test -r ${tclconfig}/tclConfig.sh; then . ${tclconfig}/tclConfig.sh if test -r ${tclconfig}/../generic/tcl.h; then @@ -1204,17 +1551,17 @@ for ac_hdr in sys/times.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1208: checking for $ac_hdr" >&5 +echo "configure:1555: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1241,7 +1588,7 @@ fi done echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 -echo "configure:1245: checking for bzCompressInit in -lbz2" >&5 +echo "configure:1592: checking for bzCompressInit in -lbz2" >&5 ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1249,7 +1596,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1292,17 +1639,17 @@ if test "$ac_cv_lib_bz2_bzCompressInit" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1296: checking for $ac_hdr" >&5 +echo "configure:1643: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1330,12 +1677,12 @@ done fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1334: checking for ANSI C header files" >&5 +echo "configure:1681: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1343,7 +1690,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1360,7 +1707,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1378,7 +1725,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1399,7 +1746,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1410,7 +1757,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1436,29 +1783,6 @@ fi if test "$ac_cv_header_stdc" = "no"; then echo "configure: warning: Your system doesn't seem to support ANSI C" 1>&2 fi -if test -r LICENSE.zmbol; then - cat >> confdefs.h <<\EOF -#define ZMBOL 1 -EOF - - PROGPREFIX=zmbol - SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index" - SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isamc/Makefile isam/Makefile rset/Makefile recctrl/Makefile index/Makefile" - SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\ - ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\ - ../lib/zebrautl.a" -else - PROGPREFIX=zebra - SUBDIR="util bfile dfa dict isams rset recctrl index" - SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile rset/Makefile recctrl/Makefile index/Makefile" - SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\ - ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\ - ../lib/zebrautl.a" - cat >> confdefs.h <<\EOF -#define ZMBOL 0 -EOF - -fi trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1572,7 +1896,22 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "$SUBMAKE" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo " + Makefile + util/Makefile + bfile/Makefile + dfa/Makefile + dict/Makefile + isams/Makefile + isamc/Makefile + isam/Makefile + rset/Makefile + recctrl/Makefile + index/Makefile + include/Makefile + tab/Makefile + test/Makefile test/gils/Makefile test/usmarc/Makefile +" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index e08d6b1..29b3cc4 100644 --- a/configure.in +++ b/configure.in @@ -1,17 +1,49 @@ -dnl Zebra, Index Data Aps, 1994-1999 -dnl $Id: configure.in,v 1.17 2000-03-15 15:00:30 adam Exp $ -dnl See the file LICENSE.2 for details. +dnl Zebra, Index Data Aps, 1994-2000 +dnl $Id: configure.in,v 1.18 2000-04-05 09:49:35 adam Exp $ dnl AC_INIT(include/zebraver.h) +AC_MSG_CHECKING(for package) +if test -r ${srcdir}/LICENSE.zmbol; then + AC_MSG_RESULT([Z'mbol]) + PROGPREFIX=zmbol + AC_DEFINE(ZMBOL,1) + AM_INIT_AUTOMAKE(zmbol,1.1) + SUBLIBS="../rset/librset.a \ + ../dict/libdict.a \ + ../isams/libisams.a \ + ../isam/libisam.a \ + ../isamc/libisamc.a \ + ../recctrl/librecctrl.a \ + ../bfile/libbfile.a \ + ../dfa/libdfa.a \ + ../util/libutil.a" +else + AC_MSG_RESULT([Zebra]) + PROGPREFIX=zebra + AC_DEFINE(ZMBOL,0) + AM_INIT_AUTOMAKE(zebra,1.1) + SUBLIBS="../rset/librset.a ../dict/libdict.a ../isams/libisams.a \ + ../recctrl/librecctrl.a \ + ../bfile/libbfile.a ../dfa/libdfa.a \ + ../util/libutil.a" + if test ! -r ${srcdir}/isam; then + mkdir ${srcdir}/isam + touch ${srcdir}/isam/Makefile.in + fi + if test ! -r ${srcdir}/isamc; then + mkdir ${srcdir}/isamc + touch ${srcdir}/isamc/Makefile.in + fi +fi +AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol) dnl ------ Substitutions +AC_SUBST(SUBLIBS) AC_SUBST(ODEFS) AC_SUBST(DEFS) AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) AC_SUBST(YAZLIB) AC_SUBST(YAZINC) -AC_SUBST(SUBDIR) -AC_SUBST(SUBLIBS) AC_SUBST(PROGPREFIX) dnl dnl ------ Checking programs @@ -20,17 +52,6 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_RANLIB dnl -dnl ------ Create sub directory lib/bin -if test ! -d lib; then - mkdir lib -fi -if test ! -d bin; then - mkdir bin -fi -dnl ------ Build root -AC_SUBST(build_root) -AC_ARG_WITH(build-root, [ --with-buildroot RPM Build root],[build_root=$withval],[build_root=""]) -dnl dnl ------ Look for Yaz dnl See if user specified location of yaz-config; otherwise dnl use ../yaz if is a directory (internal development); otherwise @@ -129,25 +150,20 @@ AC_STDC_HEADERS if test "$ac_cv_header_stdc" = "no"; then AC_MSG_WARN(Your system doesn't seem to support ANSI C) fi -dnl -dnl ------ Is it Zebra or Z'mbol -if test -r LICENSE.zmbol; then - AC_DEFINE(ZMBOL,1) - PROGPREFIX=zmbol - SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index" - SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isamc/Makefile isam/Makefile rset/Makefile recctrl/Makefile index/Makefile" - SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\ - ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\ - ../lib/zebrautl.a" -else - PROGPREFIX=zebra - SUBDIR="util bfile dfa dict isams rset recctrl index" - SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile rset/Makefile recctrl/Makefile index/Makefile" - SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\ - ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\ - ../lib/zebrautl.a" - AC_DEFINE(ZMBOL,0) -fi -dnl dnl ------ Create Makefiles -AC_OUTPUT($SUBMAKE) +AC_OUTPUT([ + Makefile + util/Makefile + bfile/Makefile + dfa/Makefile + dict/Makefile + isams/Makefile + isamc/Makefile + isam/Makefile + rset/Makefile + recctrl/Makefile + index/Makefile + include/Makefile + tab/Makefile + test/Makefile test/gils/Makefile test/usmarc/Makefile +]) diff --git a/dfa/Makefile.am b/dfa/Makefile.am new file mode 100644 index 0000000..3058c3b --- /dev/null +++ b/dfa/Makefile.am @@ -0,0 +1,17 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:35 adam Exp $ + +noinst_LIBRARIES = libdfa.a + +noinst_PROGRAMS = agrep lexer grepper + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +LDADD = libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@ + +agrep_SOURCES = agrep.c + +lexer_SOURCES = lexer.c readfile.c + +grepper_SOURCES = grepper.c + +libdfa_a_SOURCES = dfa.c imalloc.c states.c set.c bset.c \ + dfap.h imalloc.h lexer.h diff --git a/dfa/Makefile.in b/dfa/Makefile.in index 90be746..a8cf1b3 100644 --- a/dfa/Makefile.in +++ b/dfa/Makefile.in @@ -1,57 +1,354 @@ -# Copyright (C) 1994-1999, Index Data ApS -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.5 1999-11-30 13:48:03 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -TPROG1=agrep -TPROG2=lexer -TPROG3=grepper -DEFS=$(CDEFS) $(INCLUDE) -LIB=../lib/dfa.a -PO = dfa.o imalloc.o states.o set.o bset.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -alll: $(LIB) $(TPROG1) $(TPROG2) $(TPROG3) +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -$(TPROG1): $(TPROG1).o $(LIB) ../lib/zebrautl.a - $(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \ - ../lib/zebrautl.a $(YAZLIB) +DESTDIR = -$(TPROG2): $(TPROG2).o readfile.o $(LIB) ../lib/zebrautl.a - $(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o readfile.o $(LIB) \ - ../lib/zebrautl.a $(YAZLIB) +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -$(TPROG3): $(TPROG3).o $(LIB) ../lib/zebrautl.a - $(CC) $(CFLAGS) -o $(TPROG3) $(TPROG3).o $(LIB) $(YAZLIB) \ - ../lib/zebrautl.a $(YAZLIB) +top_builddir = .. -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -clean: - rm -f *.[oa] $(TPROG1) $(TPROG2) $(TPROG3) core mon.out gmon.out errlist +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +noinst_LIBRARIES = libdfa.a -#Depend --- DOT NOT DELETE THIS LINE +noinst_PROGRAMS = agrep lexer grepper + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +LDADD = libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@ + +agrep_SOURCES = agrep.c + +lexer_SOURCES = lexer.c readfile.c + +grepper_SOURCES = grepper.c + +libdfa_a_SOURCES = dfa.c imalloc.c states.c set.c bset.c dfap.h imalloc.h lexer.h + +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libdfa_a_LIBADD = +libdfa_a_OBJECTS = dfa.o imalloc.o states.o set.o bset.o +AR = ar +PROGRAMS = $(noinst_PROGRAMS) + +agrep_OBJECTS = agrep.o +agrep_LDADD = $(LDADD) +agrep_DEPENDENCIES = libdfa.a ../util/libutil.a +agrep_LDFLAGS = +lexer_OBJECTS = lexer.o readfile.o +lexer_LDADD = $(LDADD) +lexer_DEPENDENCIES = libdfa.a ../util/libutil.a +lexer_LDFLAGS = +grepper_OBJECTS = grepper.o +grepper_LDADD = $(LDADD) +grepper_DEPENDENCIES = libdfa.a ../util/libutil.a +grepper_LDFLAGS = +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/agrep.P .deps/bset.P .deps/dfa.P .deps/grepper.P \ +.deps/imalloc.P .deps/lexer.P .deps/readfile.P .deps/set.P \ +.deps/states.P +SOURCES = $(libdfa_a_SOURCES) $(agrep_SOURCES) $(lexer_SOURCES) $(grepper_SOURCES) +OBJECTS = $(libdfa_a_OBJECTS) $(agrep_OBJECTS) $(lexer_OBJECTS) $(grepper_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu dfa/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libdfa.a: $(libdfa_a_OBJECTS) $(libdfa_a_DEPENDENCIES) + -rm -f libdfa.a + $(AR) cru libdfa.a $(libdfa_a_OBJECTS) $(libdfa_a_LIBADD) + $(RANLIB) libdfa.a + +mostlyclean-noinstPROGRAMS: + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + +distclean-noinstPROGRAMS: + +maintainer-clean-noinstPROGRAMS: + +agrep: $(agrep_OBJECTS) $(agrep_DEPENDENCIES) + @rm -f agrep + $(LINK) $(agrep_LDFLAGS) $(agrep_OBJECTS) $(agrep_LDADD) $(LIBS) + +lexer: $(lexer_OBJECTS) $(lexer_DEPENDENCIES) + @rm -f lexer + $(LINK) $(lexer_LDFLAGS) $(lexer_OBJECTS) $(lexer_LDADD) $(LIBS) + +grepper: $(grepper_OBJECTS) $(grepper_DEPENDENCIES) + @rm -f grepper + $(LINK) $(grepper_LDFLAGS) $(grepper_OBJECTS) $(grepper_LDADD) $(LIBS) + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = dfa + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu dfa/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) $(PROGRAMS) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-noinstPROGRAMS mostlyclean-tags \ + mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-noinstPROGRAMS \ + clean-tags clean-depend clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-noinstPROGRAMS distclean-tags \ + distclean-depend distclean-generic clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile \ + maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile mostlyclean-noinstPROGRAMS \ +distclean-noinstPROGRAMS clean-noinstPROGRAMS \ +maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/dict/Makefile.am b/dict/Makefile.am new file mode 100644 index 0000000..c673404 --- /dev/null +++ b/dict/Makefile.am @@ -0,0 +1,15 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:35 adam Exp $ + +noinst_LIBRARIES = libdict.a +## noinst_PROGRAMS = dicttest dictext + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +LDADD = ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@ + +libdict_a_SOURCES = scan.c dopen.c dclose.c drdwr.c open.c close.c insert.c \ + lookup.c lookupec.c lookgrep.c delete.c dcompact.c + +## dicttest_SOURCES = dicttest.c + +## dictext_SOURCES = dictext.c + diff --git a/dict/Makefile.in b/dict/Makefile.in index 3ee321b..e995b4b 100644 --- a/dict/Makefile.in +++ b/dict/Makefile.in @@ -1,52 +1,309 @@ -# Copyright (C) 1994-1998, Index Data -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.5 1999-11-30 13:48:03 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -TPROG1=dicttest -TPROG2=dictext -DEFS=$(CDEFS) $(INCLUDE) -LIB=../lib/dict.a -PO = scan.o dopen.o dclose.o drdwr.o open.o close.o insert.o lookup.o \ - lookupec.o lookgrep.o delete.o dcompact.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -alll: $(LIB) $(TPROG1) $(TPROG2) +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -$(TPROG1): $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/zebrautl.a ../lib/dfa.a - $(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \ - ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a $(YAZLIB) +DESTDIR = -$(TPROG2): $(TPROG2).o $(LIB) ../lib/zebrautl.a - $(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/zebrautl.a $(YAZLIB) +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +top_builddir = .. -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ -clean: - rm -f *.[oa] $(TPROG1) $(TPROG2) core mon.out gmon.out errlist +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ -#Depend --- DOT NOT DELETE THIS LINE +noinst_LIBRARIES = libdict.a + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +LDADD = ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@ + +libdict_a_SOURCES = scan.c dopen.c dclose.c drdwr.c open.c close.c insert.c lookup.c lookupec.c lookgrep.c delete.c dcompact.c + +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libdict_a_LIBADD = +libdict_a_OBJECTS = scan.o dopen.o dclose.o drdwr.o open.o close.o \ +insert.o lookup.o lookupec.o lookgrep.o delete.o dcompact.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/close.P .deps/dclose.P .deps/dcompact.P \ +.deps/delete.P .deps/dopen.P .deps/drdwr.P .deps/insert.P \ +.deps/lookgrep.P .deps/lookup.P .deps/lookupec.P .deps/open.P \ +.deps/scan.P +SOURCES = $(libdict_a_SOURCES) +OBJECTS = $(libdict_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu dict/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libdict.a: $(libdict_a_OBJECTS) $(libdict_a_DEPENDENCIES) + -rm -f libdict.a + $(AR) cru libdict.a $(libdict_a_OBJECTS) $(libdict_a_LIBADD) + $(RANLIB) libdict.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = dict + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu dict/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..20c2709 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,29 @@ +# $Id: Makefile.am,v 1.1 2000-04-05 09:49:35 adam Exp $ +docdir=$(pkgdatadir)/doc + +doc_data = zebra.sgml gils.sgml + +EXTRA_DIST = zebra.sgml gils.sgml + +zebra.txt: zebra.sgml + sgml2txt -f zebra.sgml + +zebra.ps: zebra.sgml + sgml2latex -o ps -p a4 zebra.sgml + +zebra.html: zebra.sgml + sgml2html zebra.sgml + + +gils.txt: gils.sgml + sgml2txt -f gils.sgml + +gils.ps: gils.sgml + sgml2latex -o ps -p a4 gils.sgml + +gils.html: gils.sgml + sgml2html gils.sgml + +clean-hook: + rm -f [0-9]* *.bak + diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..43cd085 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,5 @@ + +EXTRA_DIST = bfile.h bset.h charmap.h dfa.h dict.h direntz.h isam.h \ + isamc.h isamd.h isams.h mfile.h passwddb.h recctrl.h res.h rsbool.h rset.h \ + rsisam.h rsisamc.h rsisams.h rsm_or.h rsnull.h rstemp.h set.h sortidx.h \ + str.h zebra-lock.h zebramap.h zebrautl.h zebraver.h diff --git a/include/zebra-lock.h b/include/zebra-lock.h index 01f338d..1f4fba6 100644 --- a/include/zebra-lock.h +++ b/include/zebra-lock.h @@ -11,7 +11,11 @@ YAZ_BEGIN_CDECL typedef struct { +#if HAVE_PTHREAD_H pthread_mutex_t mutex; +#else + int dummy; +#endif } Zebra_mutex; YAZ_EXPORT int zebra_mutex_init (Zebra_mutex *p); @@ -22,8 +26,10 @@ YAZ_EXPORT int zebra_mutex_unlock (Zebra_mutex *p); typedef struct { int readers_reading; int writers_writing; +#if HAVE_PTHREAD_H pthread_mutex_t mutex; pthread_cond_t lock_free; +#endif } Zebra_lock_rdwr; YAZ_EXPORT int zebra_lock_rdwr_init (Zebra_lock_rdwr *p); @@ -34,8 +40,12 @@ YAZ_EXPORT int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p); YAZ_EXPORT int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p); typedef struct { +#if HAVE_PTHREAD_H pthread_mutex_t mutex; pthread_cond_t cond; +#else + int dummy; +#endif } Zebra_mutex_cond; YAZ_EXPORT int zebra_mutex_cond_init (Zebra_mutex_cond *p); @@ -46,4 +56,5 @@ YAZ_EXPORT int zebra_mutex_cond_wait (Zebra_mutex_cond *p); YAZ_EXPORT int zebra_mutex_cond_signal (Zebra_mutex_cond *p); YAZ_END_CDECL + #endif diff --git a/index/Makefile.in b/index/Makefile.in index a519e7d..17b76a5 100644 --- a/index/Makefile.in +++ b/index/Makefile.in @@ -1,73 +1,378 @@ -# Copyright (C) 1995-1999, Index Data -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.11 2000-03-20 19:08:36 adam Exp $ - -SHELL=/bin/sh - -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ -TCL_LIB=@TCL_LIB@ - -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ - -INCLUDE=-I../include $(YAZINC) -TCL_INCLUDE=@TCL_INCLUDE@ -TPROG1=../bin/@PROGPREFIX@idx -TPROG2=kdump -TPROG3=../bin/@PROGPREFIX@srv -TPROG4=hlvltest -TPROG5=apitest -DEFS=$(CDEFS) $(INCLUDE) $(TCL_INCLUDE) -O1 = main.o dir.o dirs.o trav.o extract.o kinput.o kcompare.o \ - symtab.o recindex.o recstat.o lockutil.o lockidx.o \ - zinfo.o invstat.o sortidx.o compact.o -O2 = kdump.o -O3 = zserver.o kcompare.o zrpn.o zsets.o attribute.o recindex.o \ - lockutil.o locksrv.o zinfo.o trunc.o sortidx.o rank1.o zebraapi.o \ - retrieve.o kinput.o -O4 = hlvl.o hlvltest.o kcompare.o -O5 = apitest.o kcompare.o zrpn.o zsets.o attribute.o recindex.o \ - lockutil.o locksrv.o zinfo.o trunc.o sortidx.o rank1.o zebraapi.o \ - retrieve.o - -all: $(TPROG1) $(TPROG2) $(TPROG3) - -$(TPROG1): $(O1) @SUBLIBS@ - $(CC) $(CFLAGS) -o $(TPROG1) $(O1) @SUBLIBS@ \ - $(YAZLIB) $(TCL_LIB) $(LIBS) - -$(TPROG2): $(O2) @SUBLIBS@ - $(CC) $(CFLAGS) -o $(TPROG2) $(O2) @SUBLIBS@ \ - $(YAZLIB) $(LIBS) - -$(TPROG3): $(O3) @SUBLIBS@ - $(CC) $(CFLAGS) -o $(TPROG3) $(O3) @SUBLIBS@ \ - $(YAZLIB) $(OSILIB) $(TCL_LIB) $(LIBS) -lm - -$(TPROG4): $(O4) @SUBLIBS@ - $(CC) $(CFLAGS) -o $(TPROG4) $(O4) @SUBLIBS@ \ - $(YAZLIB) $(OSILIB) $(TCL_LIB) $(LIBS) -lm - -$(TPROG5): $(O5) @SUBLIBS@ - $(CC) $(CFLAGS) -o $(TPROG5) $(O5) @SUBLIBS@ \ - $(YAZLIB) $(OSILIB) $(TCL_LIB) $(LIBS) -lm - - -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< - -clean: - rm -f *.[oa] $(TPROG1) $(TPROG2) $(TPROG3) $(TPROG4) $(TPROG5) - rm -f core mon.out gmon.out errlist - -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile - -#Depend --- DOT NOT DELETE THIS LINE +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ +@ISZMBOL_TRUE@bin_PROGRAMS = zmbolidx zmbolsrv apitest +@ISZMBOL_FALSE@bin_PROGRAMS = zebraidx zebrasrv +@ISZMBOL_TRUE@zmbolidx_SOURCES = main.c dir.c dirs.c trav.c extract.c kinput.c kcompare.c symtab.c recindex.c recstat.c lockutil.c lockidx.c zinfo.c invstat.c sortidx.c compact.c index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h + +@ISZMBOL_TRUE@zmbolsrv_SOURCES = zserver.c kcompare.c zrpn.c zsets.c attribute.c recindex.c lockutil.c locksrv.c zinfo.c trunc.c sortidx.c rank1.c zebraapi.c retrieve.c kinput.c index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h +@ISZMBOL_FALSE@zebraidx_SOURCES = main.c dir.c dirs.c trav.c extract.c kinput.c kcompare.c symtab.c recindex.c recstat.c lockutil.c lockidx.c zinfo.c invstat.c sortidx.c compact.c index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h + +@ISZMBOL_FALSE@zebrasrv_SOURCES = zserver.c kcompare.c zrpn.c zsets.c attribute.c recindex.c lockutil.c locksrv.c zinfo.c trunc.c sortidx.c rank1.c zebraapi.c retrieve.c kinput.c index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h + +apitest_SOURCES = apitest.c kcompare.c zrpn.c zsets.c attribute.c recindex.c lockutil.c locksrv.c zinfo.c trunc.c sortidx.c rank1.c zebraapi.c retrieve.c kinput.c index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h + + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +LDADD = @SUBLIBS@ @YAZLIB@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +PROGRAMS = $(bin_PROGRAMS) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +@ISZMBOL_TRUE@zmbolidx_OBJECTS = main.o dir.o dirs.o trav.o extract.o \ +@ISZMBOL_TRUE@kinput.o kcompare.o symtab.o recindex.o recstat.o \ +@ISZMBOL_TRUE@lockutil.o lockidx.o zinfo.o invstat.o sortidx.o \ +@ISZMBOL_TRUE@compact.o +zmbolidx_LDADD = $(LDADD) +zmbolidx_DEPENDENCIES = +zmbolidx_LDFLAGS = +@ISZMBOL_TRUE@zmbolsrv_OBJECTS = zserver.o kcompare.o zrpn.o zsets.o \ +@ISZMBOL_TRUE@attribute.o recindex.o lockutil.o locksrv.o zinfo.o \ +@ISZMBOL_TRUE@trunc.o sortidx.o rank1.o zebraapi.o retrieve.o kinput.o +zmbolsrv_LDADD = $(LDADD) +zmbolsrv_DEPENDENCIES = +zmbolsrv_LDFLAGS = +apitest_OBJECTS = apitest.o kcompare.o zrpn.o zsets.o attribute.o \ +recindex.o lockutil.o locksrv.o zinfo.o trunc.o sortidx.o rank1.o \ +zebraapi.o retrieve.o kinput.o +apitest_LDADD = $(LDADD) +apitest_DEPENDENCIES = +apitest_LDFLAGS = +@ISZMBOL_FALSE@zebraidx_OBJECTS = main.o dir.o dirs.o trav.o extract.o \ +@ISZMBOL_FALSE@kinput.o kcompare.o symtab.o recindex.o recstat.o \ +@ISZMBOL_FALSE@lockutil.o lockidx.o zinfo.o invstat.o sortidx.o \ +@ISZMBOL_FALSE@compact.o +zebraidx_LDADD = $(LDADD) +zebraidx_DEPENDENCIES = +zebraidx_LDFLAGS = +@ISZMBOL_FALSE@zebrasrv_OBJECTS = zserver.o kcompare.o zrpn.o zsets.o \ +@ISZMBOL_FALSE@attribute.o recindex.o lockutil.o locksrv.o zinfo.o \ +@ISZMBOL_FALSE@trunc.o sortidx.o rank1.o zebraapi.o retrieve.o kinput.o +zebrasrv_LDADD = $(LDADD) +zebrasrv_DEPENDENCIES = +zebrasrv_LDFLAGS = +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/apitest.P .deps/attribute.P .deps/compact.P \ +.deps/dir.P .deps/dirs.P .deps/extract.P .deps/invstat.P \ +.deps/kcompare.P .deps/kinput.P .deps/lockidx.P .deps/locksrv.P \ +.deps/lockutil.P .deps/main.P .deps/rank1.P .deps/recindex.P \ +.deps/recstat.P .deps/retrieve.P .deps/sortidx.P .deps/symtab.P \ +.deps/trav.P .deps/trunc.P .deps/zebraapi.P .deps/zinfo.P .deps/zrpn.P \ +.deps/zserver.P .deps/zsets.P +SOURCES = $(zmbolidx_SOURCES) $(zmbolsrv_SOURCES) $(apitest_SOURCES) $(zebraidx_SOURCES) $(zebrasrv_SOURCES) +OBJECTS = $(zmbolidx_OBJECTS) $(zmbolsrv_OBJECTS) $(apitest_OBJECTS) $(zebraidx_OBJECTS) $(zebrasrv_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu index/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-binPROGRAMS: + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +distclean-binPROGRAMS: + +maintainer-clean-binPROGRAMS: + +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +zmbolidx: $(zmbolidx_OBJECTS) $(zmbolidx_DEPENDENCIES) + @rm -f zmbolidx + $(LINK) $(zmbolidx_LDFLAGS) $(zmbolidx_OBJECTS) $(zmbolidx_LDADD) $(LIBS) + +zmbolsrv: $(zmbolsrv_OBJECTS) $(zmbolsrv_DEPENDENCIES) + @rm -f zmbolsrv + $(LINK) $(zmbolsrv_LDFLAGS) $(zmbolsrv_OBJECTS) $(zmbolsrv_LDADD) $(LIBS) + +apitest: $(apitest_OBJECTS) $(apitest_DEPENDENCIES) + @rm -f apitest + $(LINK) $(apitest_LDFLAGS) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS) + +zebraidx: $(zebraidx_OBJECTS) $(zebraidx_DEPENDENCIES) + @rm -f zebraidx + $(LINK) $(zebraidx_LDFLAGS) $(zebraidx_OBJECTS) $(zebraidx_LDADD) $(LIBS) + +zebrasrv: $(zebrasrv_OBJECTS) $(zebrasrv_DEPENDENCIES) + @rm -f zebrasrv + $(LINK) $(zebrasrv_LDFLAGS) $(zebrasrv_OBJECTS) $(zebrasrv_LDADD) $(LIBS) + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = index + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu index/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-binPROGRAMS +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-binPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(bindir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ + distclean-depend distclean-generic clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-binPROGRAMS \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ +maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/index/recindex.c b/index/recindex.c index 1b4d561..29006d7 100644 --- a/index/recindex.c +++ b/index/recindex.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: recindex.c,v $ - * Revision 1.28 1999-12-08 22:44:45 adam + * Revision 1.29 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.28 1999/12/08 22:44:45 adam * Zebra/Z'mbol dependencies added. * * Revision 1.27 1999/10/29 10:02:33 adam @@ -396,6 +399,7 @@ Records rec_open (BFiles bfs, int rw, int compression_method) p->cache_cur = 0; p->record_cache = (struct record_cache_entry *) xmalloc (sizeof(*p->record_cache)*p->cache_max); + zebra_mutex_init (&p->mutex); return p; } @@ -635,6 +639,7 @@ void rec_close (Records *pp) assert (p); + zebra_mutex_destroy (&p->mutex); rec_cache_flush (p, 0); xfree (p->record_cache); @@ -655,8 +660,7 @@ void rec_close (Records *pp) *pp = NULL; } - -Record rec_get (Records p, int sysno) +static Record rec_get_int (Records p, int sysno) { int i, in_size, r; Record rec, *recp; @@ -791,7 +795,17 @@ Record rec_get (Records p, int sysno) return rec; } -Record rec_new (Records p) +Record rec_get (Records p, int sysno) +{ + Record rec; + zebra_mutex_lock (&p->mutex); + + rec = rec_get_int (p, sysno); + zebra_mutex_unlock (&p->mutex); + return rec; +} + +static Record rec_new_int (Records p) { int sysno, i; Record rec; @@ -827,10 +841,21 @@ Record rec_new (Records p) return rec; } +Record rec_new (Records p) +{ + Record rec; + zebra_mutex_lock (&p->mutex); + + rec = rec_new_int (p); + zebra_mutex_unlock (&p->mutex); + return rec; +} + void rec_del (Records p, Record *recpp) { Record *recp; + zebra_mutex_lock (&p->mutex); (p->head.no_records)--; if ((recp = rec_cache_lookup (p, (*recpp)->sysno, recordFlagDelete))) { @@ -842,6 +867,7 @@ void rec_del (Records p, Record *recpp) rec_cache_insert (p, *recpp, recordFlagDelete); rec_rm (recpp); } + zebra_mutex_unlock (&p->mutex); *recpp = NULL; } @@ -849,6 +875,7 @@ void rec_put (Records p, Record *recpp) { Record *recp; + zebra_mutex_lock (&p->mutex); if ((recp = rec_cache_lookup (p, (*recpp)->sysno, recordFlagWrite))) { rec_rm (recp); @@ -859,6 +886,7 @@ void rec_put (Records p, Record *recpp) rec_cache_insert (p, *recpp, recordFlagWrite); rec_rm (recpp); } + zebra_mutex_unlock (&p->mutex); *recpp = NULL; } diff --git a/index/recindex.h b/index/recindex.h index 31ae460..1c1321b 100644 --- a/index/recindex.h +++ b/index/recindex.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1999, Index Data + * Copyright (C) 1994-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recindex.h,v $ - * Revision 1.17 1999-07-06 12:28:04 adam + * Revision 1.18 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.17 1999/07/06 12:28:04 adam * Updated record index structure. Format includes version ID. Compression * algorithm ID is stored for each record block. * @@ -70,12 +73,13 @@ * */ +#ifndef RECINDEX_H +#define RECINDEX_H + #include #include -#ifdef __cplusplus -extern "C" { -#endif +YAZ_BEGIN_CDECL #define REC_NO_INFO 8 @@ -86,6 +90,7 @@ typedef struct record_info { size_t size[REC_NO_INFO]; char buf_size[REC_NO_INFO][6]; size_t size_size[REC_NO_INFO]; + Zebra_mutex mutex; } *Record; typedef struct records_info *Records; @@ -113,6 +118,5 @@ enum { recInfo_attr }; -#ifdef __cplusplus -} +YAZ_END_CDECL #endif diff --git a/index/recindxp.h b/index/recindxp.h index bad75ee..a2a7f6d 100644 --- a/index/recindxp.h +++ b/index/recindxp.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1999, Index Data + * Copyright (C) 1994-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recindxp.h,v $ - * Revision 1.7 1999-07-06 12:28:04 adam + * Revision 1.8 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.7 1999/07/06 12:28:04 adam * Updated record index structure. Format includes version ID. Compression * algorithm ID is stored for each record block. * @@ -40,9 +43,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif +YAZ_BEGIN_CDECL #define REC_BLOCK_TYPES 2 #define REC_HEAD_MAGIC "recindex" @@ -66,6 +67,8 @@ struct records_info { int cache_cur; int cache_max; + Zebra_mutex mutex; + struct records_head { char magic[8]; char version[4]; @@ -96,6 +99,4 @@ struct record_index_entry { int size; /* size of record or 0 if free entry */ }; -#ifdef __cplusplus -} -#endif +YAZ_END_CDECL diff --git a/index/zebraapi.c b/index/zebraapi.c index 7062e17..de9b074 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -3,7 +3,10 @@ * All rights reserved. * * $Log: zebraapi.c,v $ - * Revision 1.29 2000-03-20 19:08:36 adam + * Revision 1.30 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.29 2000/03/20 19:08:36 adam * Added remote record import using Z39.50 extended services and Segment * Requests. * @@ -143,6 +146,8 @@ static void zebra_register_unlock (ZebraHandle zh); static int zebra_register_lock (ZebraHandle zh) { + zh->errCode = 0; + zh->errString = 0; if (!zh->service->active) { zh->errCode = 1019; @@ -175,6 +180,7 @@ ZebraHandle zebra_open (ZebraService zs) zh->errString = 0; zh->key_buf = 0; + zh->admin_databaseName = 0; zebra_mutex_cond_lock (&zs->session_lock); @@ -413,6 +419,7 @@ void zebra_close (ZebraHandle zh) xfree (zh->key_buf); zh->key_buf = 0; } + xfree (zh->admin_databaseName); zebra_mutex_cond_lock (&zs->session_lock); sp = &zs->sessions; while (1) @@ -522,7 +529,6 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, if (zebra_register_lock (zh)) return; - zh->errCode = 0; pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); for (i = 0; iadmin_databaseName); + zh->admin_databaseName = xstrdup(database); zebra_register_unlock(zh); } +void zebra_admin_import_end (ZebraHandle zh) +{ + zebraExplain_flush (zh->service->zei, 1, zh); + extract_index (zh); +} + void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { + int sysno; + int i; if (zebra_register_lock (zh)) return; - if (segment->num_segmentRecords == 0) + for (i = 0; inum_segmentRecords; i++) { - zebraExplain_flush (zh->service->zei, 1, zh); - extract_index (zh); - } - else - { - int sysno; - int i; - for (i = 0; inum_segmentRecords; i++) + Z_NamePlusRecord *npr = segment->segmentRecords[i]; + const char *databaseName = npr->databaseName; + + if (!databaseName) + databaseName = zh->admin_databaseName; + printf ("--------------%d--------------------\n", i); + if (npr->which == Z_NamePlusRecord_intermediateFragment) { - Z_NamePlusRecord *npr = segment->segmentRecords[i]; - printf ("--------------%d--------------------\n", i); - if (npr->which == Z_NamePlusRecord_intermediateFragment) + Z_FragmentSyntax *fragment = npr->u.intermediateFragment; + if (fragment->which == Z_FragmentSyntax_notExternallyTagged) { - Z_FragmentSyntax *fragment = npr->u.intermediateFragment; - if (fragment->which == Z_FragmentSyntax_notExternallyTagged) - { - Odr_oct *oct = fragment->u.notExternallyTagged; - printf ("%.*s", (oct->len > 100 ? 100 : oct->len) , - oct->buf); - - sysno = 0; - extract_rec_in_mem (zh, "grs.sgml", - oct->buf, oct->len, - "Default", 0 /* delete_flag */, - 0 /* test_mode */, - &sysno /* sysno */, - 1 /* store_keys */, - 1 /* store_data */, - 0 /* match criteria */); - } + Odr_oct *oct = fragment->u.notExternallyTagged; + printf ("%.*s", (oct->len > 100 ? 100 : oct->len) , + oct->buf); + + sysno = 0; + extract_rec_in_mem (zh, "grs.sgml", + oct->buf, oct->len, + databaseName, + 0 /* delete_flag */, + 0 /* test_mode */, + &sysno /* sysno */, + 1 /* store_keys */, + 1 /* store_data */, + 0 /* match criteria */); } } } @@ -1313,7 +1324,6 @@ static int extract_rec_in_mem (ZebraHandle zh, const char *recordType, zh->keys.prevSeqNo = 0; zh->sortKeys = 0; - extractCtrl.subType = subType; extractCtrl.init = extract_init; extractCtrl.tokenAdd = extract_token_add; diff --git a/index/zebraapi.h b/index/zebraapi.h index 60adace..2935fef 100644 --- a/index/zebraapi.h +++ b/index/zebraapi.h @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraapi.h,v $ - * Revision 1.11 2000-03-20 19:08:36 adam + * Revision 1.12 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.11 2000/03/20 19:08:36 adam * Added remote record import using Z39.50 extended services and Segment * Requests. * @@ -133,4 +136,5 @@ YAZ_EXPORT void zebra_admin_import_begin (ZebraHandle zh, const char *database); YAZ_EXPORT void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment); +void zebra_admin_import_end (ZebraHandle zh); YAZ_END_CDECL diff --git a/index/zrpn.c b/index/zrpn.c index 5b7e7ea..812d78f 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995-1999, Index Data + * Copyright (C) 1995-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zrpn.c,v $ - * Revision 1.103 2000-03-20 19:08:36 adam + * Revision 1.104 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.103 2000/03/20 19:08:36 adam * Added remote record import using Z39.50 extended services and Segment * Requests. * diff --git a/index/zserver.c b/index/zserver.c index de9ec00..a59fa6a 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,12 @@ /* - * Copyright (C) 1995-1999, Index Data + * Copyright (C) 1995-2000, Index Data * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.77 2000-03-20 19:08:36 adam + * Revision 1.78 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.77 2000/03/20 19:08:36 adam * Added remote record import using Z39.50 extended services and Segment * Requests. * @@ -300,6 +302,9 @@ static int bend_sort (void *handle, bend_sort_rr *rr); static int bend_delete (void *handle, bend_delete_rr *rr); static int bend_esrequest (void *handle, bend_esrequest_rr *rr); static int bend_segment (void *handle, bend_segment_rr *rr); +static int bend_search (void *handle, bend_search_rr *r); +static int bend_fetch (void *handle, bend_fetch_rr *r); +static int bend_scan (void *handle, bend_scan_rr *r); bend_initresult *bend_init (bend_initrequest *q) { @@ -316,6 +321,9 @@ bend_initresult *bend_init (bend_initrequest *q) q->bend_delete = bend_delete; q->bend_esrequest = bend_esrequest; q->bend_segment = bend_segment; + q->bend_search = bend_search; + q->bend_fetch = bend_fetch; + q->bend_scan = bend_scan; q->implementation_name = "Z'mbol Information Server"; q->implementation_version = "Z'mbol 1.0"; @@ -355,22 +363,20 @@ bend_initresult *bend_init (bend_initrequest *q) return r; } -bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) +int bend_search (void *handle, bend_search_rr *r) { ZebraHandle zh = (ZebraHandle) handle; - bend_searchresult *r = (bend_searchresult *) - odr_malloc (q->stream, sizeof(*r)); r->hits = 0; r->errcode = 0; r->errstring = NULL; - logf (LOG_LOG, "ResultSet '%s'", q->setname); - switch (q->query->which) + logf (LOG_LOG, "ResultSet '%s'", r->setname); + switch (r->query->which) { case Z_Query_type_1: case Z_Query_type_101: - zebra_search_rpn (zh, q->decode, q->stream, q->query->u.type_1, - q->num_bases, q->basenames, q->setname); + zebra_search_rpn (zh, r->decode, r->stream, r->query->u.type_1, + r->num_bases, r->basenames, r->setname); r->errcode = zh->errCode; r->errstring = zh->errString; r->hits = zh->hits; @@ -382,21 +388,19 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) default: r->errcode = 107; } - return r; + return 0; } -bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) +int bend_fetch (void *handle, bend_fetch_rr *r) { ZebraHandle zh = (ZebraHandle) handle; - bend_fetchresult *r = (bend_fetchresult *) - odr_malloc (q->stream, sizeof(*r)); ZebraRetrievalRecord retrievalRecord; - retrievalRecord.position = q->number; + retrievalRecord.position = r->number; r->last_in_set = 0; - zebra_records_retrieve (zh, q->stream, q->setname, q->comp, - q->format, 1, &retrievalRecord); + zebra_records_retrieve (zh, r->stream, r->setname, r->comp, + r->request_format, 1, &retrievalRecord); if (zh->errCode) /* non Surrogate Diagnostic */ { r->errcode = zh->errCode; @@ -404,7 +408,7 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) } else if (retrievalRecord.errCode) /* Surrogate Diagnostic */ { - q->surrogate_flag = 1; + r->surrogate_flag = 1; r->errcode = retrievalRecord.errCode; r->errstring = retrievalRecord.errString; r->basename = retrievalRecord.base; @@ -415,27 +419,22 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) r->basename = retrievalRecord.base; r->record = retrievalRecord.buf; r->len = retrievalRecord.len; - r->format = retrievalRecord.format; + r->output_format = retrievalRecord.format; } - return r; + return 0; } -bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) +static int bend_scan (void *handle, bend_scan_rr *r) { ZebraScanEntry *entries; ZebraHandle zh = (ZebraHandle) handle; - bend_scanresult *r = (bend_scanresult *) - odr_malloc (q->stream, sizeof(*r)); int is_partial, i; - r->term_position = q->term_position; - r->num_entries = q->num_entries; - r->entries = (struct scan_entry *) - odr_malloc (q->stream, sizeof(*r->entries) * q->num_entries); - zebra_scan (zh, q->stream, q->term, - q->attributeset, - q->num_bases, q->basenames, + odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries); + zebra_scan (zh, r->stream, r->term, + r->attributeset, + r->num_bases, r->basenames, &r->term_position, &r->num_entries, &entries, &is_partial); if (is_partial) @@ -449,7 +448,7 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) } r->errcode = zh->errCode; r->errstring = zh->errString; - return r; + return 0; } void bend_close (void *handle) @@ -489,8 +488,8 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) case Z_ESAdminOriginPartToKeep_truncate: yaz_log(LOG_LOG, "adm-truncate"); break; - case Z_ESAdminOriginPartToKeep_delete: - yaz_log(LOG_LOG, "adm-delete"); + case Z_ESAdminOriginPartToKeep_drop: + yaz_log(LOG_LOG, "adm-drop"); break; case Z_ESAdminOriginPartToKeep_create: yaz_log(LOG_LOG, "adm-create"); @@ -498,6 +497,7 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) break; case Z_ESAdminOriginPartToKeep_import: yaz_log(LOG_LOG, "adm-import"); + zebra_admin_import_begin (zh, r->toKeep->databaseName); break; case Z_ESAdminOriginPartToKeep_refresh: yaz_log(LOG_LOG, "adm-refresh"); @@ -545,8 +545,12 @@ static int es_admin (ZebraHandle zh, Z_Admin *r) int bend_segment (void *handle, bend_segment_rr *rr) { ZebraHandle zh = (ZebraHandle) handle; + Z_Segment *segment = rr->segment; - zebra_admin_import_segment (zh, rr->segment); + if (segment->num_segmentRecords) + zebra_admin_import_segment (zh, rr->segment); + else + zebra_admin_import_end (zh); return 0; } @@ -826,12 +830,7 @@ int main (int argc, char **argv) sob->bend_start = bend_start; sob->bend_stop = bend_stop; - if (sob->dynamic) - { - sob->dynamic = 0; - sob->threads = 1; - } statserv_setcontrol (sob); - return statserv_main (argc, argv); + return statserv_main (argc, argv, bend_init, bend_close); } diff --git a/index/zserver.h b/index/zserver.h index be38062..8da07ff 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.h,v $ - * Revision 1.47 2000-03-20 19:08:36 adam + * Revision 1.48 2000-04-05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.47 2000/03/20 19:08:36 adam * Added remote record import using Z39.50 extended services and Segment * Requests. * @@ -262,6 +265,7 @@ struct zebra_session { size_t ptr_i; size_t key_buf_used; int key_file_no; + char *admin_databaseName; int destroyed; ZebraSet sets; diff --git a/index/zsets.c b/index/zsets.c index 07d4f03..5fce7d3 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1999, Index Data + * Copyright (C) 1994-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zsets.c,v $ - * Revision 1.26 2000-03-20 19:08:36 adam + * Revision 1.27 2000-04-05 09:49:36 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.26 2000/03/20 19:08:36 adam * Added remote record import using Z39.50 extended services and Segment * Requests. * @@ -595,7 +598,6 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem, } rset_close (rset, rfd); - zh->errCode = 0; *sort_status = Z_SortStatus_success; logf (LOG_DEBUG, "resultSetSortSingle end"); } diff --git a/isam/Makefile.am b/isam/Makefile.am new file mode 100644 index 0000000..43295e6 --- /dev/null +++ b/isam/Makefile.am @@ -0,0 +1,10 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ + +noinst_LIBRARIES = libisam.a + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +LDADD = ../util/libutil.a ../bfile/libbfile.a @YAZLIB@ @LIBS@ + +libisam_a_SOURCES = isam.c isutil.c rootblk.c memory.c physical.c \ + isutil.h keyops.h memory.h physical.h rootblk.h diff --git a/isam/Makefile.in b/isam/Makefile.in index 0c0ce41..15578de 100644 --- a/isam/Makefile.in +++ b/isam/Makefile.in @@ -1,57 +1,307 @@ -# Copyright (C) 1994-1998, Index Data -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.4 1999-11-30 13:48:04 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -DEFS=$(CDEFS) $(INCLUDE) -LIB=../lib/isam.a -PO = isam.o isutil.o rootblk.o memory.o physical.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -alll: $(LIB) # isam-test issh +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -test: test.c $(LIB) - $(CC) -g -o test -I../include test.c \ - ../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB) +DESTDIR = -isam-test: isam-test.c $(LIB) - $(CC) -g -o isam-test -I../include isam-test.c \ - ../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB) +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -issh: issh.c $(LIB) - $(CC) -g -o issh $(INCLUDE) issh.c \ - ../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB) +top_builddir = .. -#$(TPROG): $(TPROG).o $(LIB) -# $(CC) -o $(TPROG) $(TPROG).o $(LIB) +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ -clean: - rm -f *.[oa] $(TPROG) core mon.out gmon.out errlist test isam-test issh +noinst_LIBRARIES = libisam.a -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +INCLUDES = -I$(srcdir)/../include @YAZINC@ -#Depend --- DOT NOT DELETE THIS LINE +LDADD = ../util/libutil.a ../bfile/libbfile.a @YAZLIB@ @LIBS@ + +libisam_a_SOURCES = isam.c isutil.c rootblk.c memory.c physical.c isutil.h keyops.h memory.h physical.h rootblk.h + +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libisam_a_LIBADD = +libisam_a_OBJECTS = isam.o isutil.o rootblk.o memory.o physical.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/isam.P .deps/isutil.P .deps/memory.P .deps/physical.P \ +.deps/rootblk.P +SOURCES = $(libisam_a_SOURCES) +OBJECTS = $(libisam_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu isam/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libisam.a: $(libisam_a_OBJECTS) $(libisam_a_DEPENDENCIES) + -rm -f libisam.a + $(AR) cru libisam.a $(libisam_a_OBJECTS) $(libisam_a_LIBADD) + $(RANLIB) libisam.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = isam + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu isam/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/isamc/Makefile.am b/isamc/Makefile.am new file mode 100644 index 0000000..32cae1c --- /dev/null +++ b/isamc/Makefile.am @@ -0,0 +1,9 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ + +noinst_LIBRARIES = libisamc.a + +libisamc_a_SOURCES = isamc.c isamd.c merge.c merge-d.c isamc-p.h isamd-p.h + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a @YAZLIB@ diff --git a/isamc/Makefile.in b/isamc/Makefile.in index efc95cd..2e32f7b 100644 --- a/isamc/Makefile.in +++ b/isamc/Makefile.in @@ -1,47 +1,305 @@ -# Copyright (C) 1996-1999, Index Data -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.7 1999-11-30 13:48:04 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -TPROG1=isamctst -DEFS=$(CDEFS) $(INCLUDE) -LIB=../lib/isamc.a -PO = isamc.o isamd.o merge.o merge-d.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -alll: $(LIB) +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -$(TPROG1): $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/zebrautl.a - $(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \ - ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB) +DESTDIR = -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +top_builddir = .. -clean: - rm -f *.[oa] $(TPROG1) core mon.out gmon.out errlist *~ +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -#Depend --- DOT NOT DELETE THIS LINE +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ + +noinst_LIBRARIES = libisamc.a + +libisamc_a_SOURCES = isamc.c isamd.c merge.c merge-d.c isamc-p.h isamd-p.h + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a @YAZLIB@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libisamc_a_LIBADD = +libisamc_a_OBJECTS = isamc.o isamd.o merge.o merge-d.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/isamc.P .deps/isamd.P .deps/merge-d.P .deps/merge.P +SOURCES = $(libisamc_a_SOURCES) +OBJECTS = $(libisamc_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu isamc/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libisamc.a: $(libisamc_a_OBJECTS) $(libisamc_a_DEPENDENCIES) + -rm -f libisamc.a + $(AR) cru libisamc.a $(libisamc_a_OBJECTS) $(libisamc_a_LIBADD) + $(RANLIB) libisamc.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = isamc + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu isamc/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/isams/Makefile.am b/isams/Makefile.am new file mode 100644 index 0000000..8e19c42 --- /dev/null +++ b/isams/Makefile.am @@ -0,0 +1,7 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ + +noinst_LIBRARIES = libisams.a + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +libisams_a_SOURCES = isams.c diff --git a/isams/Makefile.in b/isams/Makefile.in index 70f864f..59dcf1b 100644 --- a/isams/Makefile.in +++ b/isams/Makefile.in @@ -1,42 +1,303 @@ -# Copyright (C) 1996-1999, Index Data -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.1 1999-11-30 14:02:45 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -DEFS=$(CDEFS) $(INCLUDE) -LIB=../lib/isams.a -PO = isams.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -alll: $(LIB) +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +DESTDIR = -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -clean: - rm -f *.[oa] $(TPROG1) core mon.out gmon.out errlist *~ +top_builddir = .. -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ -#Depend --- DOT NOT DELETE THIS LINE +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ + +noinst_LIBRARIES = libisams.a + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +libisams_a_SOURCES = isams.c +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libisams_a_LIBADD = +libisams_a_OBJECTS = isams.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/isams.P +SOURCES = $(libisams_a_SOURCES) +OBJECTS = $(libisams_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu isams/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libisams.a: $(libisams_a_OBJECTS) $(libisams_a_DEPENDENCIES) + -rm -f libisams.a + $(AR) cru libisams.a $(libisams_a_OBJECTS) $(libisams_a_LIBADD) + $(RANLIB) libisams.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = isams + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu isams/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/missing b/missing new file mode 100755 index 0000000..7789652 --- /dev/null +++ b/missing @@ -0,0 +1,190 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. +# Copyright (C) 1996, 1997 Free Software Foundation, Inc. +# Franc,ois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing - GNU libit 0.0" + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + + aclocal) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`acinclude.m4' or \`configure.in'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`configure.in'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`acconfig.h' or \`configure.in'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + makeinfo) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + fi + touch $file + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequirements for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 diff --git a/mkinstalldirs b/mkinstalldirs new file mode 100755 index 0000000..6912085 --- /dev/null +++ b/mkinstalldirs @@ -0,0 +1,40 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy +# Author: Noah Friedman +# Created: 1993-05-16 +# Public domain + +# $Id: mkinstalldirs,v 1.1 2000-04-05 09:49:35 adam Exp $ + +errstatus=0 + +for file +do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift + + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case "$pathcomp" in + -* ) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + fi + fi + + pathcomp="$pathcomp/" + done +done + +exit $errstatus + +# mkinstalldirs ends here diff --git a/recctrl/Makefile.am b/recctrl/Makefile.am new file mode 100644 index 0000000..298fdb6 --- /dev/null +++ b/recctrl/Makefile.am @@ -0,0 +1,7 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ + +noinst_LIBRARIES = librecctrl.a + +librecctrl_a_SOURCES = recctrl.c recgrs.c sgmlread.c regxread.c \ + marcread.c rectext.c grsread.h recgrs.h rectext.h +INCLUDES = -I$(srcdir)/../include @YAZINC@ diff --git a/recctrl/Makefile.in b/recctrl/Makefile.in index ffa7712..eabe058 100644 --- a/recctrl/Makefile.in +++ b/recctrl/Makefile.in @@ -1,41 +1,305 @@ -# Copyright (C) 1995-1999, Index Data -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.5 1999-11-30 13:48:04 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -TCL_INCLUDE=@TCL_INCLUDE@ -DEFS=$(CDEFS) $(INCLUDE) $(TCL_INCLUDE) -LIB=../lib/recctrl.a -PO=recctrl.o recgrs.o sgmlread.o regxread.o marcread.o rectext.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +DESTDIR = -clean: - rm -f *.[oa] core mon.out gmon.out errlist +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +top_builddir = .. -#Depend --- DOT NOT DELETE THIS LINE +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ + +noinst_LIBRARIES = librecctrl.a + +librecctrl_a_SOURCES = recctrl.c recgrs.c sgmlread.c regxread.c marcread.c rectext.c grsread.h recgrs.h rectext.h + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +librecctrl_a_LIBADD = +librecctrl_a_OBJECTS = recctrl.o recgrs.o sgmlread.o regxread.o \ +marcread.o rectext.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/marcread.P .deps/recctrl.P .deps/recgrs.P \ +.deps/rectext.P .deps/regxread.P .deps/sgmlread.P +SOURCES = $(librecctrl_a_SOURCES) +OBJECTS = $(librecctrl_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu recctrl/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +librecctrl.a: $(librecctrl_a_OBJECTS) $(librecctrl_a_DEPENDENCIES) + -rm -f librecctrl.a + $(AR) cru librecctrl.a $(librecctrl_a_OBJECTS) $(librecctrl_a_LIBADD) + $(RANLIB) librecctrl.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = recctrl + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu recctrl/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/rset/Makefile.am b/rset/Makefile.am new file mode 100644 index 0000000..c1992f9 --- /dev/null +++ b/rset/Makefile.am @@ -0,0 +1,8 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ +noinst_LIBRARIES = librset.a + +librset_a_SOURCES = rset.c rstemp.c rsisam.c rsnull.c rsbool.c \ + rsisamc.c rsm_or.c rsisams.c + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + diff --git a/rset/Makefile.in b/rset/Makefile.in index e21a1a6..ccbe487 100644 --- a/rset/Makefile.in +++ b/rset/Makefile.in @@ -1,41 +1,306 @@ -# Copyright (C) 1994-1999, Index Data -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.5 1999-11-30 13:48:04 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -DEFS=$(CDEFS) $(INCLUDE) -LIB=../lib/rset.a -PROG= -PO=rset.o rstemp.o rsisam.o rsnull.o rsbool.o rsisamc.o rsm_or.o rsisams.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +DESTDIR = -clean: - rm -f *.[oa] core mon.out gmon.out errlist +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +top_builddir = .. -#Depend --- DOT NOT DELETE THIS LINE +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ + +noinst_LIBRARIES = librset.a + +librset_a_SOURCES = rset.c rstemp.c rsisam.c rsnull.c rsbool.c rsisamc.c rsm_or.c rsisams.c + + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +librset_a_LIBADD = +librset_a_OBJECTS = rset.o rstemp.o rsisam.o rsnull.o rsbool.o \ +rsisamc.o rsm_or.o rsisams.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/rsbool.P .deps/rset.P .deps/rsisam.P .deps/rsisamc.P \ +.deps/rsisams.P .deps/rsm_or.P .deps/rsnull.P .deps/rstemp.P +SOURCES = $(librset_a_SOURCES) +OBJECTS = $(librset_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu rset/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +librset.a: $(librset_a_OBJECTS) $(librset_a_DEPENDENCIES) + -rm -f librset.a + $(AR) cru librset.a $(librset_a_OBJECTS) $(librset_a_LIBADD) + $(RANLIB) librset.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = rset + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu rset/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tab/Makefile.am b/tab/Makefile.am new file mode 100644 index 0000000..69cc1be --- /dev/null +++ b/tab/Makefile.am @@ -0,0 +1,11 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ + +tabdatadir = $(pkgdatadir)/tab + +tabdata_DATA = default.idx default.idx~ hci.flt mail.flt news.flt \ + numeric.chr nwi.flt out out,v refer.flt scan.chr sgml.flt soif.flt \ + string.chr urx.chr usmarc.flt + +EXTRA_DIST = default.idx default.idx~ hci.flt mail.flt news.flt \ + numeric.chr nwi.flt out out,v refer.flt scan.chr sgml.flt soif.flt \ + string.chr urx.chr usmarc.flt diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..5a75551 --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,2 @@ + +SUBDIRS=gils usmarc diff --git a/test/gils/Makefile.am b/test/gils/Makefile.am new file mode 100644 index 0000000..56c9752 --- /dev/null +++ b/test/gils/Makefile.am @@ -0,0 +1,6 @@ + +EXTRA_DIST = zebra.cfg test.sh + +dist-hook: + -mkdir $(distdir)/records + cp $(srcdir)/records/*.grs $(distdir)/records diff --git a/test/usmarc/Makefile.am b/test/usmarc/Makefile.am new file mode 100644 index 0000000..bd1cf5d --- /dev/null +++ b/test/usmarc/Makefile.am @@ -0,0 +1,10 @@ + +EXTRA_DIST = zebra.cfg test.sh + +dist-hook: + -mkdir $(distdir)/records + cp $(srcdir)/records/*marc* $(distdir)/records + mkdir $(distdir)/shadow + mkdir $(distdir)/register + mkdir $(distdir)/lock + mkdir $(distdir)/tmp diff --git a/util/Makefile.am b/util/Makefile.am new file mode 100644 index 0000000..840dd00 --- /dev/null +++ b/util/Makefile.am @@ -0,0 +1,17 @@ +## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ + +noinst_LIBRARIES = libutil.a + +noinst_PROGRAMS = passtest + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +LDADD = libutil.a @YAZLIB@ @LIBS@ + +TESTS = passtest + +libutil_a_SOURCES = res.c charmap.c zebramap.c passwddb.c zebra-lock.c + +passtest_SOURCES = passtest.c + + +LIBS = diff --git a/util/Makefile.in b/util/Makefile.in index 7a5335f..0d843b8 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -1,49 +1,361 @@ -# Copyright (C) 1994-1998, Index Data ApS -# All rights reserved. -# Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.5 2000-03-15 15:00:31 adam Exp $ +# Makefile.in generated automatically by automake 1.4 from Makefile.am -SHELL=/bin/sh +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -CC=@CC@ -CPP=@CPP@ -RANLIB=@RANLIB@ -CDEFS=@DEFS@ @ODEFS@ -LIBS=@LIBS@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -YAZLIB=@YAZLIB@ -YAZINC=@YAZINC@ -INCLUDE=-I../include $(YAZINC) -TPROG=opt-test -DEFS=$(CDEFS) $(INCLUDE) -DUSE_CRYPT=0 -LIB=../lib/zebrautl.a -PO = res.o charmap.o zebramap.o passwddb.o zebra-lock.o +SHELL = @SHELL@ -all: $(LIB) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -alll: res-test all passtest +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -res-test: res-test.o $(LIB) - $(CC) -o res-test res-test.o $(LIB) $(YAZLIB) +DESTDIR = -passtest: passtest.o $(LIB) - $(CC) -o passtest passtest.o $(LIB) $(YAZLIB) -lcrypt +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -$(LIB): $(PO) - rm -f $(LIB) - ar qc $(LIB) $(PO) - $(RANLIB) $(LIB) +top_builddir = .. -.c.o: - $(CC) -c $(DEFS) $(CFLAGS) $< +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ -clean: - rm -f *.[oa] res-test core mon.out gmon.out errlist +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -depend: - sed '/^#Depend/q' Makefile.tmp - $(CPP) $(DEFS) -M *.c >>Makefile.tmp - mv -f Makefile.tmp Makefile +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +ODEFS = @ODEFS@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLIB = @YAZLIB@ +yazconfig = @yazconfig@ -#Depend --- DOT NOT DELETE THIS LINE +noinst_LIBRARIES = libutil.a + +noinst_PROGRAMS = passtest + +INCLUDES = -I$(srcdir)/../include @YAZINC@ +LDADD = libutil.a @YAZLIB@ @LIBS@ + +TESTS = passtest + +libutil_a_SOURCES = res.c charmap.c zebramap.c passwddb.c zebra-lock.c + +passtest_SOURCES = passtest.c + +LIBS = +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +libutil_a_LIBADD = +libutil_a_OBJECTS = res.o charmap.o zebramap.o passwddb.o zebra-lock.o +AR = ar +PROGRAMS = $(noinst_PROGRAMS) + +passtest_OBJECTS = passtest.o +passtest_LDADD = $(LDADD) +passtest_DEPENDENCIES = libutil.a +passtest_LDFLAGS = +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/charmap.P .deps/passtest.P .deps/passwddb.P \ +.deps/res.P .deps/zebra-lock.P .deps/zebramap.P +SOURCES = $(libutil_a_SOURCES) $(passtest_SOURCES) +OBJECTS = $(libutil_a_OBJECTS) $(passtest_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libutil.a: $(libutil_a_OBJECTS) $(libutil_a_DEPENDENCIES) + -rm -f libutil.a + $(AR) cru libutil.a $(libutil_a_OBJECTS) $(libutil_a_LIBADD) + $(RANLIB) libutil.a + +mostlyclean-noinstPROGRAMS: + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + +distclean-noinstPROGRAMS: + +maintainer-clean-noinstPROGRAMS: + +passtest: $(passtest_OBJECTS) $(passtest_DEPENDENCIES) + @rm -f passtest + $(LINK) $(passtest_LDFLAGS) $(passtest_OBJECTS) $(passtest_LDADD) $(LIBS) + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = util + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu util/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +check-TESTS: $(TESTS) + @failed=0; all=0; \ + srcdir=$(srcdir); export srcdir; \ + for tst in $(TESTS); do \ + if test -f $$tst; then dir=.; \ + else dir="$(srcdir)"; fi; \ + if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ + all=`expr $$all + 1`; \ + echo "PASS: $$tst"; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="$$failed of $$all tests failed"; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0 +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) $(PROGRAMS) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-noinstPROGRAMS mostlyclean-tags \ + mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-noinstPROGRAMS \ + clean-tags clean-depend clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-noinstPROGRAMS distclean-tags \ + distclean-depend distclean-generic clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile \ + maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile mostlyclean-noinstPROGRAMS \ +distclean-noinstPROGRAMS clean-noinstPROGRAMS \ +maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend check-TESTS \ +info-am info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/util/zebra-lock.c b/util/zebra-lock.c index 0e08cde..47b2424 100644 --- a/util/zebra-lock.c +++ b/util/zebra-lock.c @@ -5,25 +5,33 @@ int zebra_mutex_init (Zebra_mutex *p) { +#if HAVE_PTHREAD_H pthread_mutex_init (&p->mutex, 0); +#endif return 0; } int zebra_mutex_destroy (Zebra_mutex *p) { +#if HAVE_PTHREAD_H pthread_mutex_destroy (&p->mutex); +#endif return 0; } int zebra_mutex_lock (Zebra_mutex *p) { +#if HAVE_PTHREAD_H pthread_mutex_lock (&p->mutex); +#endif return 0; } int zebra_mutex_unlock (Zebra_mutex *p) { +#if HAVE_PTHREAD_H pthread_mutex_unlock (&p->mutex); +#endif return 0; } @@ -31,8 +39,10 @@ int zebra_lock_rdwr_init (Zebra_lock_rdwr *p) { p->readers_reading = 0; p->writers_writing = 0; +#if HAVE_PTHREAD_H pthread_mutex_init (&p->mutex, 0); pthread_cond_init (&p->lock_free, 0); +#endif return 0; } @@ -40,33 +50,40 @@ int zebra_lock_rdwr_destroy (Zebra_lock_rdwr *p) { assert (p->readers_reading == 0); assert (p->writers_writing == 0); +#if HAVE_PTHREAD_H pthread_mutex_destroy (&p->mutex); pthread_cond_destroy (&p->lock_free); +#endif return 0; } int zebra_lock_rdwr_rlock (Zebra_lock_rdwr *p) { +#if HAVE_PTHREAD_H pthread_mutex_lock (& p->mutex); while (p->writers_writing) pthread_cond_wait (&p->lock_free, &p->mutex); p->readers_reading++; pthread_mutex_unlock(&p->mutex); +#endif return 0; } int zebra_lock_rdwr_wlock (Zebra_lock_rdwr *p) { +#if HAVE_PTHREAD_H pthread_mutex_lock (&p->mutex); while (p->writers_writing || p->readers_reading) pthread_cond_wait (&p->lock_free, &p->mutex); p->writers_writing++; pthread_mutex_unlock (&p->mutex); +#endif return 0; } int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p) { +#if HAVE_PTHREAD_H pthread_mutex_lock (&p->mutex); if (p->readers_reading == 0) { @@ -80,11 +97,13 @@ int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p) pthread_cond_signal (&p->lock_free); pthread_mutex_unlock (&p->mutex); } +#endif return 0; } int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p) { +#if HAVE_PTHREAD_H pthread_mutex_lock (&p->mutex); if (p->writers_writing == 0) { @@ -97,40 +116,60 @@ int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p) pthread_cond_broadcast(&p->lock_free); pthread_mutex_unlock(&p->mutex); } +#endif return 0; } int zebra_mutex_cond_init (Zebra_mutex_cond *p) { +#if HAVE_PTHREAD_H pthread_cond_init (&p->cond, 0); pthread_mutex_init (&p->mutex, 0); +#endif return 0; } int zebra_mutex_cond_destroy (Zebra_mutex_cond *p) { +#if HAVE_PTHREAD_H pthread_cond_destroy (&p->cond); pthread_mutex_destroy (&p->mutex); +#endif return 0; } int zebra_mutex_cond_lock (Zebra_mutex_cond *p) { +#if HAVE_PTHREAD_H return pthread_mutex_lock (&p->mutex); +#else + return 0; +#endif } int zebra_mutex_cond_unlock (Zebra_mutex_cond *p) { +#if HAVE_PTHREAD_H return pthread_mutex_unlock (&p->mutex); +#else + return 0; +#endif } int zebra_mutex_cond_wait (Zebra_mutex_cond *p) { +#if HAVE_PTHREAD_H return pthread_cond_wait (&p->cond, &p->mutex); +#else + return 0; +#endif } int zebra_mutex_cond_signal (Zebra_mutex_cond *p) { +#if HAVE_PTHREAD_H return pthread_cond_signal (&p->cond); +#else + return 0; +#endif } -