X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile.am;h=b64cc2242eb0f6e83c133bf30453459fdbb4a762;hb=d8c29911dfa8d98b9adcc843bbc43fa6f139fe9b;hp=02f7e0760d6522096569de182f357f4e15cf5d33;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9;p=yaz-moved-to-github.git

diff --git a/test/Makefile.am b/test/Makefile.am
index 02f7e07..b64cc22 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,38 +1,58 @@
-## Copyright (C) 1994-2003, Index Data
+## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.1 2003-10-27 12:21:38 adam Exp $
+## $Id: Makefile.am,v 1.8 2005-09-08 13:25:33 adam Exp $
 
-check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl
+check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
+ tstsoap1 tstsoap2 tstodrstack tstlogthread
+check_SCRIPTS = tstcql.sh tstmarc.sh
 
-TESTS = $(check_PROGRAMS)
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
-EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h
+EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
+ $(check_SCRIPTS) \
+ marc1 marc1.xml marc2 marc2.xml marc3 marc3.xml marc4 marc4.xml
+
+if ISTHR
+extra=../src/libyazthread.la
+endif
 
 YAZCOMP = $(top_srcdir)/util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
+AM_CFLAGS=@CFLAGSTHREADS@
+
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 
+dist-hook:
+	mkdir -p $(distdir)/cql
+	cp $(srcdir)/cql/*.err $(distdir)/cql
+	cp $(srcdir)/cql/*.out $(distdir)/cql
+
 # Rule for generating codecs for our small ASN.1 spec
 tstodrcodec.c tstodrcodec.h: tstodr.asn $(YAZCOMP)
 	cd $(srcdir); $(YAZCOMP) tstodr.asn
 
-# Tests..
-tsticonv_LDADD = ../src/libyaz.la
+LDADD = $(extra) ../src/libyaz.la $(LIBTHREAD)
+
 tsticonv_SOURCES = tsticonv.c
 
-tstnmem_LDADD = ../src/libyaz.la
 tstnmem_SOURCES = tstnmem.c
 
-tstmatchstr_LDADD = ../src/libyaz.la
 tstmatchstr_SOURCES = tstmatchstr.c
 
-tstwrbuf_LDADD = ../src/libyaz.la
 tstwrbuf_SOURCES = tstwrbuf.c
 
-tstodr_LDADD = ../src/libyaz.la
 tstodr_SOURCES = tstodrcodec.c tstodrcodec.h tstodr.c
 
-tstccl_LDADD = ../src/libyaz.la
+tstodrstack_SOURCES = tstodrstack.c
+
 tstccl_SOURCES = tstccl.c
 
+tstlog_SOURCES = tstlog.c
+
+tstsoap1_SOURCES = tstsoap1.c
+
+tstsoap2_SOURCES = tstsoap2.c
+
+tstlogthread_SOURCES = tstlogthread.c
+