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

diff --git a/test/Makefile.am b/test/Makefile.am
index b64cc22..790603c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,9 +1,9 @@
-## Copyright (C) 1994-2004, Index Data
+## Copyright (C) 1994-2006, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.8 2005-09-08 13:25:33 adam Exp $
+## $Id: Makefile.am,v 1.11 2006-01-27 17:33:15 adam Exp $
 
 check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
- tstsoap1 tstsoap2 tstodrstack tstlogthread
+ tstsoap1 tstsoap2 tstodrstack tstlogthread tstxmlquery
 check_SCRIPTS = tstcql.sh tstmarc.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
@@ -12,14 +12,10 @@ 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
+YAZCOMP = ../util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CFLAGS=@CFLAGSTHREADS@
+AM_CFLAGS=$(THREAD_CFLAGS)
 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 
@@ -32,27 +28,18 @@ dist-hook:
 tstodrcodec.c tstodrcodec.h: tstodr.asn $(YAZCOMP)
 	cd $(srcdir); $(YAZCOMP) tstodr.asn
 
-LDADD = $(extra) ../src/libyaz.la $(LIBTHREAD)
+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
+tstxmlquery_SOURCES = tstxmlquery.c