## This file is part of the YAZ toolkit.
-## Copyright (C) 1994-2006, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.42 2006-10-27 11:22:09 adam Exp $
+## Copyright (C) 1995-2007, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.58 2007-04-16 21:53:09 adam Exp $
-YAZ_VERSION_INFO=2:1:0
+YAZ_VERSION_INFO=3:0:0
-lib_LTLIBRARIES = libyaz.la libyazthread.la
+lib_LTLIBRARIES = libyaz.la
# noinst_PROGRAMS = cqlparse
dist-hook:
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
charconv.tcl codetables.xml \
csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv \
- csvtosru_update.tcl sru_update.csv
+ csvtosru_update.tcl sru_update.csv \
+ oidtoc.tcl oid.csv
YAZCOMP=$(top_srcdir)/util/yaz-asncomp
YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I$(top_srcdir)/include
YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
-AM_CFLAGS=$(THREAD_CFLAGS)
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
AM_YFLAGS=-p cql_
marc8r.c: charconv.tcl codetables.xml
$(TCLSH) $(srcdir)/charconv.tcl -r -p marc8r $(srcdir)/codetables.xml -o marc8r.c
+# Generate OID database from CSV
+oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
+ $(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir)/oid.csv $(srcdir)/oid_std.c $(top_srcdir)/include/yaz/oid_std.h
+
# Generate diagnostics from CSVs
diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
$(TCLSH) $(srcdir)/csvtobib1.tcl $(srcdir)
diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl sru_update.csv
$(TCLSH) $(srcdir)/csvtosru_update.tcl $(srcdir)
-libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
+libyaz_la_SOURCES=version.c options.c log.c \
+ marcdisp.c marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
+ wrbuf.c oid_db.c \
nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
siconv.c marc8.c marc8r.c \
odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.c \
ill-core.c item-req.c ill-get.c \
zget.c yaz-ccl.c diag-entry.c diag-entry.h diagbib1.c diagsrw.c \
diagsru_update.c logrpn.c \
- otherinfo.c pquery.c sortspec.c z3950oid.c charneg.c initopt.c \
- zoom-c.c zoom-opt.c zoom-p.h grs1disp.c zgdu.c soap.c srw.c srwutil.c \
+ otherinfo.c pquery.c sortspec.c charneg.c initopt.c \
+ zoom-c.c zoom-socket.c zoom-opt.c zoom-p.h \
+ grs1disp.c zgdu.c soap.c srw.c srwutil.c \
opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \
- cclqfile.c cclstr.c \
+ cclqfile.c cclstr.c cclxmlconfig.c \
cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
cqlstrer.c querytowrbuf.c \
eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
- eventl.h service.c service.h session.h test.c \
- xmlquery.c \
- mime.c mime.h \
- nfa.c nfaxml.c \
- record_conv.c retrieval.c
+ eventl.h service.c service.h session.h test.c timing.c \
+ xmlquery.c http.c \
+ mime.c mime.h oid_util.c oid_std.c \
+ record_conv.c retrieval.c elementset.c snprintf.c query-charset.c
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-# This library is only built and installed for backwards
-# compatibility (older libs depend on it). The libyaz.la is now threaded
-# by itself..
-libyazthread_la_SOURCES=version.c
-libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-
# Rules for Z39.50 V3
z-accdes1.c \
z-accform1.c \