Change the use of CFLAGS WRT ACX_PTHREAD. Thread libs/cflags are

[yaz-moved-to-github.git] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index b64cc22..95129f5 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,26 +1,33 @@
-## Copyright (C) 1994-2004, Index Data
+## Copyright (C) 1995-2007, Index Data ApS
 ## All rights reserved.
-## $Id: Makefile.am,v 1.8 2005-09-08 13:25:33 adam Exp $
+## $Id: Makefile.am,v 1.33 2007-02-25 14:46:51 adam Exp $
 
 check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
- tstsoap1 tstsoap2 tstodrstack tstlogthread
-check_SCRIPTS = tstcql.sh tstmarc.sh
+ tstsoap1 tstsoap2 tstodrstack tstlogthread tstxmlquery tstpquery \
+ tst_comstack tst_filepath tst_record_conv tst_retrieval tst_tpath \
+ tst_timing
+check_SCRIPTS = tstcql.sh tstmarciso.sh tstmarcxml.sh tstmarccol.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
 EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
+ cql2pqf-order.txt \
  $(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
+ 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 \
+ marccol1.u8.marc marccol1.u8.1.lst marccol1.u8.2.lst \
+ marccol2.u8.marc marccol2.u8.1.lst marccol2.u8.2.lst \
+ tst_record_conv.xsl 
+
+YAZCOMP = ../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:
@@ -32,27 +39,26 @@ 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
+CONFIG_CLEAN_FILES=*.log
 
+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
+tstpquery_SOURCES = tstpquery.c
+tst_comstack_SOURCES = tst_comstack.c
+tst_filepath_SOURCES = tst_filepath.c
+tst_record_conv_SOURCES = tst_record_conv.c
+tst_retrieval_SOURCES = tst_retrieval.c
+tst_tpath_SOURCES = tst_tpath.c
+tst_timing_SOURCES = tst_timing.c