Stemmer C sources part of libyaz_icu library

diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am
index f34b2a7..3571f84 100644 (file)
--- a/include/yaz/Makefile.am
+++ b/include/yaz/Makefile.am
@@ -23,7 +23,7 @@ pkginclude_HEADERS= backend.h ccl.h ccl_xml.h cql.h rpn2cql.h rpn2solr.h \
  zes-psched.h zes-admin.h zes-pset.h zes-update.h zes-update0.h \
  zoom.h z-charneg.h charneg.h soap.h srw.h zgdu.h matchstr.h json.h \
  file_glob.h dirent.h thread_id.h gettimeofday.h shptr.h thread_create.h \
- spipe.h
+ spipe.h stemmer.h
 
 EXTRA_DIST = yaz-version.h.in
 

diff --git a/src/Makefile.am b/src/Makefile.am
index d8143f5..8928ffc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ 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../libstemmer_c/include
 libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
 
 AM_YFLAGS=-p cql_
@@ -115,8 +115,18 @@ libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
 
 libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
+STEMMER_SOURCES = \
+       ../libstemmer_c/include/libstemmer.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_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
+       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