X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=a56588b35e3cf960bcfacc426eee17dfe61f5364;hb=d2be1034a4eea6cf6091bf79c6f8a3e0c1a71660;hp=5aceac1099555cef6fcc882af7583172c0deb26b;hpb=f9d5791b3b7222309b5112e8e269ff36325d7498;p=yaz-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 5aceac1..a56588b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.51 2007-01-11 10:55:57 adam Exp $
+## $Id: Makefile.am,v 1.59 2007-04-17 07:37:58 adam Exp $
 
-YAZ_VERSION_INFO=2:1:0
+YAZ_VERSION_INFO=3:0:0
 
 lib_LTLIBRARIES = libyaz.la
 # noinst_PROGRAMS = cqlparse
@@ -20,13 +20,13 @@ illdata_DATA=ill9702.asn item-req.asn ill.tcl
 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_
@@ -39,6 +39,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 $(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)
@@ -51,7 +55,7 @@ diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl
 
 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 \
+  wrbuf.c oid_std.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 \
@@ -70,7 +74,7 @@ libyaz_la_SOURCES=version.c options.c log.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 \
+  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 \
@@ -80,8 +84,8 @@ libyaz_la_SOURCES=version.c options.c log.c \
   eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
   eventl.h service.c service.h session.h test.c timing.c \
   xmlquery.c http.c \
-  mime.c mime.h \
-  record_conv.c retrieval.c elementset.c
+  mime.c mime.h oid_util.c \
+  record_conv.c retrieval.c elementset.c snprintf.c query-charset.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)