Added functions to create CCL RPN nodes. Added small tokenizer

[yaz-moved-to-github.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d163182..33112c2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,10 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.47 2007-01-03 08:42:15 adam Exp $
+## $Id: Makefile.am,v 1.65 2007-04-26 21:45:17 adam Exp $
 
-YAZ_VERSION_INFO=2:1:0
+YAZ_VERSION_INFO=3:0:0
 
-lib_LTLIBRARIES = libyaz.la
-# noinst_PROGRAMS = cqlparse
+lib_LTLIBRARIES = libyaz.la libyaz_server.la
 
 dist-hook:
        test -f $(srcdir)/cql.c || exit 1
@@ -15,19 +14,21 @@ tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
  esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
 
 illdatadir=$(pkgdatadir)/ill
-illdata_DATA=ill9702.asn item-req.asn ill.tcl
+illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
 
 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) 
+libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
+
 
 AM_YFLAGS=-p cql_
 
@@ -39,6 +40,10 @@ marc8.c: charconv.tcl codetables.xml
 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 oid_std.c oid_std.h
+
 # Generate diagnostics from CSVs
 diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
        $(TCLSH) $(srcdir)/csvtobib1.tcl $(srcdir)
@@ -49,41 +54,54 @@ diagsrw.c $(top_srcdir)/include/yaz/diagsrw.h: csvtosrw.tcl srw.csv
 diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl sru_update.csv
        $(TCLSH) $(srcdir)/csvtosru_update.tcl $(srcdir)
 
+# Auto-generated C-files
+GEN_FILES = oid_std.c \
+  marc8.c marc8r.c \
+  diagbib1.c diagsrw.c diagsru_update.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 \
+  z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c z-oclcui.c\
+  zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
+  zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c zes-admin.c \
+  z-charneg.c \
+  ill-core.c item-req.c oclc-ill-req-ext.c
+
 libyaz_la_SOURCES=version.c options.c log.c \
+ $(GEN_FILES) \
   marcdisp.c marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
-  oid.c wrbuf.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 \
+  siconv.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 \
   dumpber.c odr_enum.c odr-priv.h libxml2_error.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 \
-  z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c z-oclcui.c\
-  zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
-  zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c zes-admin.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 \
-  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 \
-  opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \
-  cclqfile.c cclstr.c \
+  ill-get.c \
+  zget.c yaz-ccl.c diag-entry.c diag-entry.h \
+  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 \
+  opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c cclp.h \
+  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 \
-  record_conv.c retrieval.c elementset.c
+  tcpdchk.c \
+  test.c timing.c \
+  xmlquery.c http.c \
+  mime.c mime.h oid_util.c tokenizer.c \
+  record_conv.c retrieval.c elementset.c snprintf.c query-charset.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
+libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
+  requestq.c eventl.h session.h service.c service.h mutex.c
+
+libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
+
 # Rules for Z39.50 V3
 z-accdes1.c \
 z-accform1.c \
@@ -159,11 +177,15 @@ $(top_srcdir)/include/yaz/ill-core.h: \
 $(srcdir)/ill.tcl $(srcdir)/ill9702.asn $(YAZCOMP)
        $(TCLSH) $(YAZCOMP_I) $(srcdir)/ill9702.asn
 
+# OCLC ILL Request Extension
+oclc-ill-req-ext.c \
+$(top_srcdir)/include/yaz/oclc-ill-req-ext.h: \
+$(srcdir)/ill.tcl $(srcdir)/oclc-ill-req-ext.asn $(YAZCOMP)
+       $(TCLSH) $(YAZCOMP_I) $(srcdir)/oclc-ill-req-ext.asn
+
 # Item Request
 item-req.c \
 $(top_srcdir)/include/yaz/item-req.h: \
 $(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
        $(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
 
-# cqlparse_SOURCES = cqlstd.y
-