From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 11 Aug 2010 14:37:06 +0000 (+0200)
Subject: Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client
X-Git-Tag: v4.1.0~40^2~1^2~5
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=598a08eba1b5875837c606b9105b9d980092b40a;hp=-c

Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client
---

598a08eba1b5875837c606b9105b9d980092b40a
diff --combined src/Makefile.am
index b5bb28f,108d618..b27d4ac
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -88,12 -88,12 +88,13 @@@ libyaz_la_SOURCES=version.c options.c l
    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 \
+   zoom-c.c zoom-z3950.c zoom-sru.c zoom-query.c zoom-record-cache.c \
+   record_render.c zoom-socket.c zoom-opt.c zoom-p.h \
    grs1disp.c zgdu.c soap.c srw.c srwutil.c uri.c \
    opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c cclp.h \
    cclqfile.c cclstr.c cclxmlconfig.c ccl_stop_words.c \
    cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c rpn2cql.c \
 +  rpn2solr.c solrtransform.c \
    cqlstrer.c querytowrbuf.c \
    tcpdchk.c \
    test.c timing.c \