X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile.am;h=a3e34de03e6f82421b55057ab37890d86612f82d;hp=102f4e9b30db4885ebc112fbc3e20b7048bfe9e3;hb=ca68610f410cfe2134cf9e6a2437df7b2ea3abdf;hpb=455798a3154b5c08c872ca0fb90607ddea575038

diff --git a/test/Makefile.am b/test/Makefile.am
index 102f4e9..a3e34de 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,54 +1,76 @@
-## Copyright (C) 1994-2004, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.9 2005-09-09 10:34:09 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1995-2008 Index Data
 
 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 tst_query_charset tst_oid tst_icu_I18N tst_match_glob tst_rpn2cql
+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 cqlsample \
+EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cql2xcqlsample \
+ cql2pqf-order.txt cql2pqfsample \
  $(check_SCRIPTS) \
- marc1 marc1.xml marc2 marc2.xml marc3 marc3.xml marc4 marc4.xml
-
-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 \
+ 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 \
+ marccol4.u8.marc marccol4.u8.1.lst marccol4.u8.2.lst \
+ 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 \
+ tst_record_conv.xsl 
+
+YAZCOMP = ../util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CFLAGS=$(THREAD_CFLAGS)
-
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(ICU_CPPFLAGS)
 
 dist-hook:
 	mkdir -p $(distdir)/cql
-	cp $(srcdir)/cql/*.err $(distdir)/cql
-	cp $(srcdir)/cql/*.out $(distdir)/cql
+	cp $(srcdir)/cql/*.err $(srcdir)/cql/*.out $(distdir)/cql
+	mkdir -p $(distdir)/cql2pqf
+	cp $(srcdir)/cql2pqf/*.err $(srcdir)/cql2pqf/*.out $(distdir)/cql2pqf
 
 # Rule for generating codecs for our small ASN.1 spec
 tstodrcodec.c tstodrcodec.h: tstodr.asn $(YAZCOMP)
 	cd $(srcdir); $(YAZCOMP) tstodr.asn
 
 LDADD = ../src/libyaz.la
+tst_icu_I18N_LDADD = ../src/libyaz_icu.la $(ICU_LIBS)
 
-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_oid_SOURCES = tst_oid.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
+tst_query_charset_SOURCES = tst_query_charset.c
+tst_icu_I18N_SOURCES = tst_icu_I18N.c
+tst_match_glob_SOURCES = tst_match_glob.c
+tst_rpn2cql_SOURCES = tst_rpn2cql.c