X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=2382f57ed7e9863b4b9d17b52576b99f943de98c;hp=5ccb53f2e2729e1967abd037983a7df97b90d531;hb=b2bc97df294f5da6c93e1119a42536b23afce8ef;hpb=7efed25c2ed807d32001e749f87f2eb300548c22

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ccb53f..2382f57 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
 
 EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
  charconv.tcl codetables.xml codetables-iso5426.xml \
- csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv \
+ csvtodiag.tcl bib1.csv srw.csv \
  csvtosru_update.tcl sru_update.csv mk_version.tcl \
  oidtoc.tcl oid.csv sc_test.c
 
@@ -25,13 +25,14 @@ 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) 
-libyaz_la_LIBADD = $(SSL_LIBS) $(TCPD_LIBS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
+libyaz_la_LIBADD = $(SSL_LIBS) $(TCPD_LIBS) $(GCRYPT_LIBS) \
+	$(MEMCACHED_LIBS) $(HIREDIS_LIBS)
 libyaz_server_la_LIBADD = libyaz.la
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS) -I$(top_srcdir)/libstemmer_c/include
 libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
 
-AM_YFLAGS=
+AM_YFLAGS=-p cql_
 
 # MARC8->UTF8 conversion is generated from codetables.xml
 marc8.c: charconv.tcl codetables.xml
@@ -50,11 +51,11 @@ oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
 	$(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir) $(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)
+diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: bib1.csv
+	$(TCLSH) $(srcdir)/csvtodiag.tcl $(srcdir)/bib1.csv $(srcdir)/diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h bib1 diagbib1_str
 
-diagsrw.c $(top_srcdir)/include/yaz/diagsrw.h: csvtosrw.tcl srw.csv
-	$(TCLSH) $(srcdir)/csvtosrw.tcl $(srcdir)
+diagsrw.c $(top_srcdir)/include/yaz/diagsrw.h: srw.csv
+	$(TCLSH) $(srcdir)/csvtodiag.tcl $(srcdir)/srw.csv $(srcdir)/diagsrw.c $(top_srcdir)/include/yaz/diagsrw.h srw
 
 diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl sru_update.csv
 	$(TCLSH) $(srcdir)/csvtosru_update.tcl $(srcdir)
@@ -89,8 +90,9 @@ libyaz_la_SOURCES= $(GEN_FILES) \
   zget.c yaz-ccl.c diag-entry.c diag-entry.h \
   logrpn.c \
   otherinfo.c pquery.c sortspec.c charneg.c initopt.c init_diag.c \
-  zoom-c.c zoom-z3950.c zoom-sru.c zoom-query.c zoom-record-cache.c \
-  zoom-event.c \
+  init_globals.c \
+  zoom-c.c zoom-memcached.c zoom-z3950.c zoom-sru.c zoom-query.c \
+  zoom-record-cache.c zoom-event.c \
   record_render.c zoom-socket.c zoom-opt.c zoom-p.h sru_facet.c sru-p.h \
   grs1disp.c zgdu.c soap.c srw.c srwutil.c uri.c solr.c diag_map.c \
   opac_to_xml.c xml_add.c xml_match.c xml_to_opac.c \
@@ -102,14 +104,14 @@ libyaz_la_SOURCES= $(GEN_FILES) \
   cqlstrer.c querytowrbuf.c \
   tcpdchk.c \
   test.c timing.c \
-  xmlquery.c xmlerror.c http.c \
+  xml_get.c xmlquery.c xmlerror.c http.c \
   mime.c mime.h oid_util.c tokenizer.c \
   record_conv.c retrieval.c elementset.c snprintf.c query-charset.c \
   copy_types.c match_glob.c poll.c daemon.c iconv_encode_danmarc.c \
   iconv_encode_marc8.c iconv_encode_iso_8859_1.c iconv_encode_wchar.c \
   iconv_decode_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.c \
   json.c xml_include.c file_glob.c dirent.c mutex-p.h mutex.c condvar.c \
-  thread_id.c gettimeofday.c thread_create.c spipe.c url.c
+  thread_id.c gettimeofday.c thread_create.c spipe.c url.c backtrace.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)