X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile.am;h=8fb85d807195aa3297fed209dc48cd6c2c9075e4;hb=41339c1f027372b433ed120569726f5448e558eb;hp=d2bb9bf32a38ab382f8606848c2397fe4ecb6530;hpb=1121eeb134f61c6c2510143858db59045c1b6757;p=yaz-moved-to-github.git

diff --git a/util/Makefile.am b/util/Makefile.am
index d2bb9bf..8fb85d8 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,10 +1,10 @@
-## Copyright (C) 1994-2002, Index Data
+## Copyright (C) 1994-2003, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.14 2002-12-16 13:13:53 adam Exp $
+## $Id: Makefile.am,v 1.18 2003-05-06 10:07:33 adam Exp $
 
 noinst_LTLIBRARIES = libutil.la
 
-#lib_LTLIBRARIES = libyazthread.la
+TESTS = tsticonv tstnmem tstmatchstr tstwrbuf
 
 bin_SCRIPTS = yaz-comp
 
@@ -14,15 +14,34 @@ AM_CPPFLAGS=-I$(top_srcdir)/include
 
 noinst_PROGRAMS = marcdump yaziconv
 
+EXTRA_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf
+
+# MARC dumper utility
 marcdump_LDADD = libutil.la 
 marcdump_SOURCES = marcdump.c
 
+# YAZ Iconv utility
 yaziconv_LDADD = libutil.la 
-yaziconv_SOURCES = siconvtst.c
+yaziconv_SOURCES = yaziconv.c
+
+# Tests..
+tsticonv_LDADD = libutil.la
+tsticonv_SOURCES = tsticonv.c
+
+tstnmem_LDADD = libutil.la
+tstnmem_SOURCES = tstnmem.c
+
+tstmatchstr_LDADD = libutil.la
+tstmatchstr_SOURCES = tstmatchstr.c
+
+tstwrbuf_LDADD = libutil.la
+tstwrbuf_SOURCES = tstwrbuf.c
 
+# MARC8 C conversion is generated from charconv.sgm
 marc8.c: charconv.sgm charconv.tcl
 	cd $(srcdir); ./charconv.tcl -p marc8 -s 50 charconv.sgm marc8.c
 
-libutil_la_SOURCES=options.c log.c marcdisp.c oid.c wrbuf.c nmemsdup.c \
-   xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c siconv.c marc8.c
+libutil_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
+   nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
+   siconv.c marc8.c