## This file is part of the YAZ toolkit.
-## Copyright (C) 1994-2006, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.38 2006-05-23 13:43:40 adam Exp $
+## Copyright (C) 1995-2007, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.53 2007-02-25 14:46:50 adam Exp $
YAZ_VERSION_INFO=2:1: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
+ csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv \
+ csvtosru_update.tcl sru_update.csv
YAZCOMP=$(top_srcdir)/util/yaz-asncomp
-YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I../include
-YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I ../include
+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_
diagsrw.c $(top_srcdir)/include/yaz/diagsrw.h: csvtosrw.tcl srw.csv
$(TCLSH) $(srcdir)/csvtosrw.tcl $(srcdir)
-libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
+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 marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
+ oid.c wrbuf.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 \
z-charneg.c \
prt-ext.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 logrpn.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 \
+ 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 \
+ eventl.h service.c service.h session.h test.c timing.c \
+ xmlquery.c http.c \
mime.c mime.h \
- nfa.c \
- record_conv.c retrieval.c
+ record_conv.c retrieval.c elementset.c snprintf.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 \
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/esadmin.asn
# Charset negotiation
-z-charneg.c: $(srcdir)/z.tcl $(srcdir)/charneg-3.asn $(YAZCOMP)
+z-charneg.c \
+$(top_srcdir)/include/yaz/z-charneg.h: \
+$(srcdir)/z.tcl $(srcdir)/charneg-3.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/charneg-3.asn
# UserInfoFormat-multipleSearchTerms-2
-z-mterm2.c: $(srcdir)/z.tcl $(srcdir)/mterm2.asn $(YAZCOMP)
+z-mterm2.c \
+$(top_srcdir)/include/yaz/z-mterm2.h: \
+$(srcdir)/z.tcl $(srcdir)/mterm2.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/mterm2.asn
# UserInfoFormat-multipleSearchTerms-2
-z-oclcui.c: $(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
+z-oclcui.c \
+$(top_srcdir)/include/yaz/z-oclcui.h: \
+$(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/oclcui.asn
# ILL protocol