X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile.am;h=2723753fb7f0f53956263e83d7110e440c862e75;hp=daad0f902309f76ae9e66ef9a7e8458392bd8c23;hb=6bc9db9f9f6944f86f1337a9a4f1e232678afc7b;hpb=3107ce3a34993d2f784387f227a50343fff83bbc

diff --git a/test/Makefile.am b/test/Makefile.am
index daad0f9..2723753 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@
 ## Copyright (C) 1995-2010 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 \
@@ -12,18 +12,9 @@ check_SCRIPTS = tstmarc.sh tstmarccol.sh tstcql2xcql.sh tstcql2pqf.sh tsticu.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
-EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cql2xcqlsample \
+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 \
@@ -43,13 +34,21 @@ 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)
+test_icu_LDADD = ../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
+test_mutex_LDADD = ../src/libyaz_server.la ../src/libyaz.la $(PTHREAD_LIBS)
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 
 
@@ -64,6 +63,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