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

diff --git a/src/Makefile.am b/src/Makefile.am
index 46c0168..5ccb53f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2010 Index Data
+## Copyright (C) Index Data
 
-YAZ_VERSION_INFO=4:0:0
+YAZ_VERSION_INFO=5:0:0
 
 lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la
 
@@ -10,7 +10,7 @@ dist-hook:
 
 tabdatadir = $(pkgdatadir)/z39.50
 tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
- esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
+ esadmin.asn charneg-3.asn mterm2.asn oclcui.asn facet.asn
 
 illdatadir=$(pkgdatadir)/ill
 illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
@@ -28,10 +28,10 @@ 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)
 libyaz_server_la_LIBADD = libyaz.la
-libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
+libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS) -I$(top_srcdir)/libstemmer_c/include
 libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
 
-AM_YFLAGS=-p cql_
+AM_YFLAGS=
 
 # MARC8->UTF8 conversion is generated from codetables.xml
 marc8.c: charconv.tcl codetables.xml
@@ -71,39 +71,45 @@ GEN_FILES = oid_std.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 \
-  wrbuf.c oid_db.c errno.c \
+libyaz_la_SOURCES= $(GEN_FILES) \
+  base64.c version.c options.c log.c \
+  cookie.c marcdisp.c \
+  marc_read_json.c marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
+  wrbuf.c wrbuf_sha1.c oid_db.c errno.c \
   nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
   siconv.c iconv-p.h utf8.c ucs4.c iso5428.c advancegreek.c \
-  odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.c \
+  odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.c facet.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 \
-  comstack.c tcpip.c waislen.c unix.c \
+  comstack.c tcpip.c unix.c \
   prt-ext.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 uri.c \
-  opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c cclp.h \
+  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 \
+  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 \
+  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 \
+  cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
+  cql_sortkeys.c cql2ccl.c rpn2cql.c \
+  rpn2solr.c solrtransform.c \
   cqlstrer.c querytowrbuf.c \
   tcpdchk.c \
   test.c timing.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 \
+  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
+  thread_id.c gettimeofday.c thread_create.c spipe.c url.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
@@ -112,8 +118,22 @@ libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
 
 libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-libyaz_icu_la_SOURCES = icu_chain.c icu_utf16.c icu_utf8.c \
-	icu_transform.c icu_casemap.c icu_tokenizer.c icu_sortkey.c
+STEMMER_SOURCES = \
+	../libstemmer_c/include/libstemmer.h \
+	../libstemmer_c/libstemmer/libstemmer.c \
+	../libstemmer_c/libstemmer/modules.h \
+	../libstemmer_c/runtime/api.c \
+	../libstemmer_c/runtime/api.h \
+	../libstemmer_c/runtime/header.h \
+	../libstemmer_c/runtime/utilities.c \
+	../libstemmer_c/src_c/stem_UTF_8_porter.c \
+	../libstemmer_c/src_c/stem_UTF_8_porter.h \
+	../libstemmer_c/src_c/stem_UTF_8_english.c \
+	../libstemmer_c/src_c/stem_UTF_8_english.h
+
+libyaz_icu_la_SOURCES = icu_chain.c icu_utf16.c icu_utf8.c stemmer.c \
+	icu_transform.c icu_casemap.c icu_tokenizer.c icu_sortkey.c \
+	$(STEMMER_SOURCES)
 libyaz_icu_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
 # Rules for Z39.50 V3