X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile.am;h=9f5ed92cf3af55ca6f6a09f699a312bc86ebc0bc;hp=7d9e7d99b84c997d2bc4f83ab82bd531a0aa710c;hb=062ae8c4cbdfd50766b13f34c11a5254825075a4;hpb=d6862f25e98c81258ac86ee865b82ba610fd0b8f

diff --git a/test/Makefile.am b/test/Makefile.am
index 7d9e7d9..9f5ed92 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,17 +1,17 @@
 ## Copyright (C) 1995-2007, Index Data ApS
 ## All rights reserved.
-## $Id: Makefile.am,v 1.31 2007-01-11 10:30:41 adam Exp $
+## $Id: Makefile.am,v 1.42 2008-01-06 21:48:23 adam Exp $
 
 check_PROGRAMS = 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
-check_SCRIPTS = tstcql.sh tstmarciso.sh tstmarcxml.sh tstmarccol.sh
+ tst_timing tst_query_charset tst_oid tst_icu_I18N tst_match_glob
+check_SCRIPTS = tstcql.sh tstmarc.sh tstmarccol.sh tstcql2pqf.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
 EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
- cql2pqf-order.txt \
+ cql2pqf-order.txt cql2pqfsample \
  $(check_SCRIPTS) \
  marc1.marc marc1.xml marc1.chr marc1.xml.marc \
  marc2.marc marc2.xml marc2.chr marc2.xml.marc \
@@ -20,27 +20,32 @@ EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
  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 \
  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 $(LDADD) $(ICU_LIBS)
 
 CONFIG_CLEAN_FILES=*.log
 
@@ -59,7 +64,11 @@ 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