-## Copyright (C) 1994-2006, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.31 2006-04-20 08:24:31 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 $
-YAZCOMP = ../util/yaz-asncomp
-YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
+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_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
AM_YFLAGS=-p cql_
# MARC8->UTF8 conversion is generated from codetables.xml
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
AM_YFLAGS=-p cql_
# MARC8->UTF8 conversion is generated from codetables.xml
-$(srcdir)/marc8.c: charconv.tcl codetables.xml
- cd $(srcdir); ./charconv.tcl -p marc8 codetables.xml -o marc8.c
+marc8.c: charconv.tcl codetables.xml
+ $(TCLSH) $(srcdir)/charconv.tcl -p marc8 $(srcdir)/codetables.xml -o marc8.c
-$(srcdir)/marc8r.c: charconv.tcl codetables.xml
- cd $(srcdir); ./charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
+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
-$(top_srcdir)/include/yaz/diagbib1.h $(srcdir)/diagbib1.c: csvtobib1.tcl bib1.csv
- cd $(srcdir); ./csvtobib1.tcl
+diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
+ $(TCLSH) $(srcdir)/csvtobib1.tcl $(srcdir)
+
+diagsrw.c $(top_srcdir)/include/yaz/diagsrw.h: csvtosrw.tcl srw.csv
+ $(TCLSH) $(srcdir)/csvtosrw.tcl $(srcdir)
-$(top_srcdir)/include/yaz/diagsrw.h $(srcdir)/diagsrw.c: csvtosrw.tcl srw.csv
- cd $(srcdir); ./csvtosrw.tcl
+diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl sru_update.csv
+ $(TCLSH) $(srcdir)/csvtosru_update.tcl $(srcdir)
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 \
odr_null.c ber_null.c odr_int.c ber_int.c odr_tag.c odr_cons.c \
odr_seq.c odr_oct.c ber_oct.c odr_bit.c ber_bit.c odr_oid.c \
ber_oid.c odr_use.c odr_choice.c odr_any.c ber_any.c odr.c odr_mem.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 \
odr_null.c ber_null.c odr_int.c ber_int.c odr_tag.c odr_cons.c \
odr_seq.c odr_oct.c ber_oct.c odr_bit.c ber_bit.c odr_oid.c \
ber_oid.c odr_use.c odr_choice.c odr_any.c ber_any.c odr.c odr_mem.c \
comstack.c tcpip.c waislen.c unix.c \
z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \
z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
comstack.c tcpip.c waislen.c unix.c \
z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \
z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
- zget.c yaz-ccl.c diag-entry.c diag-entry.h diagbib1.c diagsrw.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 \
+ 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 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 \
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 \
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
+ 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
-# 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)
-
$(top_srcdir)/include/yaz/z-accdes1.h \
$(top_srcdir)/include/yaz/z-core.h: \
$(srcdir)/z.tcl $(srcdir)/z3950v3.asn $(YAZCOMP)
$(top_srcdir)/include/yaz/z-accdes1.h \
$(top_srcdir)/include/yaz/z-core.h: \
$(srcdir)/z.tcl $(srcdir)/z3950v3.asn $(YAZCOMP)
-$(srcdir)/z-charneg.c: $(srcdir)/z.tcl $(srcdir)/charneg-3.asn $(YAZCOMP)
- cd $(srcdir); $(YAZCOMPLINE) $(YCFLAGS) charneg-3.asn
+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
-$(srcdir)/z-mterm2.c: $(srcdir)/z.tcl $(srcdir)/mterm2.asn $(YAZCOMP)
- cd $(srcdir); $(YAZCOMPLINE) mterm2.asn
+z-mterm2.c \
+$(top_srcdir)/include/yaz/z-mterm2.h: \
+$(srcdir)/z.tcl $(srcdir)/mterm2.asn $(YAZCOMP)
+ $(TCLSH) $(YAZCOMP_Z) $(srcdir)/mterm2.asn
-$(srcdir)/z-oclcui.c: $(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
- cd $(srcdir); $(YAZCOMPLINE) oclcui.asn
+z-oclcui.c \
+$(top_srcdir)/include/yaz/z-oclcui.h: \
+$(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
+ $(TCLSH) $(YAZCOMP_Z) $(srcdir)/oclcui.asn