-LDADD = ../src/libyaz.la
-
-tsticonv_SOURCES = tsticonv.c
-
-tstnmem_SOURCES = tstnmem.c
-
-tstmatchstr_SOURCES = tstmatchstr.c
-
-tstwrbuf_SOURCES = tstwrbuf.c
-
-tstodr_SOURCES = tstodrcodec.c tstodrcodec.h tstodr.c
-
-tstodrstack_SOURCES = tstodrstack.c
-
-tstccl_SOURCES = tstccl.c
-
-tstlog_SOURCES = tstlog.c
-
-tstsoap1_SOURCES = tstsoap1.c
-
-tstsoap2_SOURCES = tstsoap2.c
-
-tstlogthread_SOURCES = tstlogthread.c
-
+LDADD = ../src/libyaz.la
+test_icu_LDADD = ../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
+test_libstemmer_LDADD = ../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
+
+CONFIG_CLEAN_FILES=*.log
+
+test_cql2ccl_SOURCES = test_cql2ccl.c
+test_xmalloc_SOURCES = test_xmalloc.c
+test_iconv_SOURCES = test_iconv.c
+test_nmem_SOURCES = test_nmem.c
+test_matchstr_SOURCES = test_matchstr.c
+test_wrbuf_SOURCES = test_wrbuf.c
+test_odr_SOURCES = test_odrcodec.c test_odrcodec.h test_odr.c
+test_odrstack_SOURCES = test_odrstack.c
+test_ccl_SOURCES = test_ccl.c
+test_log_SOURCES = test_log.c
+test_mutex_SOURCES = test_mutex.c
+test_soap1_SOURCES = test_soap1.c
+test_soap2_SOURCES = test_soap2.c
+test_solr_SOURCES = test_solr.c
+test_sortspec_SOURCES = test_sortspec.c
+test_log_thread_SOURCES = test_log_thread.c
+test_xmlquery_SOURCES = test_xmlquery.c
+test_options_SOURCES = test_options.c
+test_pquery_SOURCES = test_pquery.c
+test_comstack_SOURCES = test_comstack.c
+test_filepath_SOURCES = test_filepath.c
+test_oid_SOURCES = test_oid.c
+test_record_conv_SOURCES = test_record_conv.c
+test_retrieval_SOURCES = test_retrieval.c
+test_tpath_SOURCES = test_tpath.c
+test_timing_SOURCES = test_timing.c
+test_query_charset_SOURCES = test_query_charset.c
+test_icu_SOURCES = test_icu.c
+test_match_glob_SOURCES = test_match_glob.c
+test_rpn2cql_SOURCES = test_rpn2cql.c
+test_rpn2solr_SOURCES = test_rpn2solr.c
+test_json_SOURCES = test_json.c
+test_xml_include_SOURCES = test_xml_include.c
+test_file_glob_SOURCES = test_file_glob.c
+test_shared_ptr_SOURCES = test_shared_ptr.c
+test_libstemmer_SOURCES = test_libstemmer.c
+test_embed_record_SOURCES = test_embed_record.c
+test_zgdu_SOURCES = test_zgdu.c