X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=324cb1ed3a569450c3f67434f049bb9be29a7336;hp=7e405ec65345be7ab8388a5f0c13ced9c0ee1a93;hb=54db174ec4113c44b05f3766dc6f8ad665968cfb;hpb=fb61309506b52ca0dad9aea4135ceeda63707b0d

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e405ec..324cb1e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2006, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.40 2006-07-04 12:59:56 heikki Exp $
+## $Id: Makefile.am,v 1.46 2006-12-15 12:37:18 adam Exp $
 
 YAZ_VERSION_INFO=2:1:0
 
-lib_LTLIBRARIES = libyaz.la libyazthread.la
+lib_LTLIBRARIES = libyaz.la
 # noinst_PROGRAMS = cqlparse
 
 dist-hook:
@@ -19,7 +19,8 @@ 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
+ 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$(top_srcdir)/include
@@ -45,7 +46,12 @@ diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
 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 \
@@ -62,7 +68,8 @@ libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.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 \
   opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \
@@ -73,17 +80,10 @@ libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.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
+  record_conv.c retrieval.c elementset.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 \
@@ -136,15 +136,21 @@ $(srcdir)/z.tcl $(srcdir)/esadmin.asn $(YAZCOMP)
 	$(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