X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile.am;h=1974a309817b4b216ab330b780c378a2034a76b4;hp=2e5977dfb85e3be4398db8a21886294aa913c318;hb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35;hpb=fec04146c50098096daab3c22095f7174b2aa84c

diff --git a/test/Makefile.am b/test/Makefile.am
index 2e5977d..1974a30 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,12 +1,13 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2010 Index Data
+## Copyright (C) 1995-2011 Index Data
 
 check_PROGRAMS = test_xmalloc test_iconv test_nmem test_matchstr test_wrbuf \
- test_odr test_ccl test_log \
+ test_odr test_ccl test_log test_mutex \
  test_soap1 test_soap2 test_odrstack test_log_thread test_xmlquery test_pquery \
  test_comstack test_filepath test_record_conv test_retrieval test_tpath \
  test_timing test_query_charset test_oid test_icu test_match_glob \
- test_rpn2cql test_json test_xml_include test_file_glob
+ test_rpn2cql test_rpn2solr test_json test_xml_include test_file_glob \
+ test_shared_ptr
 
 check_SCRIPTS = tstmarc.sh tstmarccol.sh tstcql2xcql.sh tstcql2pqf.sh tsticu.sh
 
@@ -15,15 +16,6 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 EXTRA_DIST = tstodr.asn test_odrcodec.c test_odrcodec.h cql2xcqlsample \
  cql2pqf-order.txt cql2pqfsample \
  $(check_SCRIPTS) \
- marc1.marc marc1.xml marc1.chr marc1.xml.marc \
- marc2.marc marc2.xml marc2.chr marc2.xml.marc \
- marc3.marc marc3.xml marc3.chr marc3.xml.marc \
- marc4.marc marc4.xml marc4.chr marc4.xml.marc \
- marc5.marc marc5.xml marc5.chr marc5.xml.marc \
- marc6.marc marc6.xml marc6.chr marc6.xml.marc \
- marc7.marc marc7.xml marc7.chr marc7.xml.marc \
- marc8.marc marc8.xml marc8.chr marc8.xml.marc \
- marc9.marc marc9.xml marc9.chr marc9.xml.marc \
  marccol1.u8.marc marccol1.u8.1.lst marccol1.u8.2.lst \
  marccol2.u8.marc marccol2.u8.1.lst marccol2.u8.2.lst \
  marccol3.u8.marc marccol3.u8.1.lst marccol3.u8.2.lst \
@@ -31,6 +23,7 @@ EXTRA_DIST = tstodr.asn test_odrcodec.c test_odrcodec.h cql2xcqlsample \
  marccol5.u8.marc marccol5.u8.1.lst marccol5.u8.2.lst \
  tsticu-0.xml tsticu-0.input tsticu-0.output \
  tsticu-1.xml tsticu-1.input tsticu-1.output \
+ tsticu-2.xml tsticu-2.input tsticu-2.output \
  test_record_conv.xsl test_xml_include.xml
 
 YAZCOMP = ../util/yaz-asncomp
@@ -43,15 +36,20 @@ dist-hook:
 	cp $(srcdir)/cql/*.err $(srcdir)/cql/*.out $(distdir)/cql
 	mkdir -p $(distdir)/cql2pqf
 	cp $(srcdir)/cql2pqf/*.err $(srcdir)/cql2pqf/*.out $(distdir)/cql2pqf
+	cp $(srcdir)/marc?.chr $(distdir)
+	cp $(srcdir)/marc?.marc $(distdir)
+	cp $(srcdir)/marc?.xml $(distdir)
+	cp $(srcdir)/*.xml.marc $(distdir)
+	cp $(srcdir)/xml2marc?.xml $(distdir)
+	cp $(srcdir)/tmarc?.xml $(distdir)
+	cp $(srcdir)/xml2tmarc?.xml $(distdir)
 
 # Rule for generating codecs for our small ASN.1 spec
 test_odrcodec.c test_odrcodec.h: tstodr.asn $(YAZCOMP)
 	cd $(srcdir); $(YAZCOMP) tstodr.asn
 
 LDADD = ../src/libyaz.la
-test_icu_LDADD = ../src/libyaz_icu.la $(ICU_LIBS)
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-
+test_icu_LDADD = ../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
 
 CONFIG_CLEAN_FILES=*.log
 
@@ -64,6 +62,7 @@ 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_log_thread_SOURCES = test_log_thread.c
@@ -80,6 +79,8 @@ 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