X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile.am;h=08c0eda950cbf6d47f2d54a950f39d8edcd0fc44;hp=b8d0b7dc95b4d1b97db2109c9a9d5f3128bbf900;hb=653561fa749dbd5c0a438f249f2927ea33d5843c;hpb=bbd768abbf09c38b0438e0186e50f3560b372dd9

diff --git a/test/Makefile.am b/test/Makefile.am
index b8d0b7d..08c0eda 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,17 +1,19 @@
-## Copyright (C) 1995-2007, Index Data ApS
-## All rights reserved.
-## $Id: Makefile.am,v 1.40 2007-10-24 13:50:03 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1995-2010 Index Data
 
-check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
+check_PROGRAMS = tstxmalloc tsticonv tstnmem tstmatchstr tstwrbuf tstodr \
+ tstccl tstlog \
  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
-check_SCRIPTS = tstcql.sh tstmarc.sh tstmarccol.sh
+ tst_timing tst_query_charset tst_oid tst_icu_I18N tst_match_glob \
+ tst_rpn2cql tst_json tst_xml_include tst_file_glob
+
+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 \
- cql2pqf-order.txt \
+EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.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 \
@@ -26,28 +28,33 @@ EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
  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 \
- tst_record_conv.xsl 
+ 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 tst_xml_include.xml
 
 YAZCOMP = ../util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
-tst_icu_I18N_CPPFLAGS=$(AM_CPPFLAGS) $(ICU_CPPFLAGS)
+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 $(LDADD) $(ICU_LIBS)
+tst_icu_I18N_LDADD = ../src/libyaz_icu.la $(ICU_LIBS)
+
 
 CONFIG_CLEAN_FILES=*.log
 
+tstxmalloc_SOURCES = tstxmalloc.c
 tsticonv_SOURCES = tsticonv.c
 tstnmem_SOURCES = tstnmem.c
 tstmatchstr_SOURCES = tstmatchstr.c
@@ -69,5 +76,10 @@ 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_CFLAGS = $(PTHREAD_CFLAGS)
 tst_icu_I18N_SOURCES = tst_icu_I18N.c
 tst_match_glob_SOURCES = tst_match_glob.c
+tst_rpn2cql_SOURCES = tst_rpn2cql.c
+tst_json_SOURCES = tst_json.c
+tst_xml_include_SOURCES = tst_xml_include.c
+tst_file_glob_SOURCES = tst_file_glob.c