-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
+# YAZ Iconv utility
+yaziconv_LDADD = libutil.la
+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=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