-libutil_a_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
+EXTRA_DIST = yaz-comp cvs-date.tcl
+
+AM_CPPFLAGS=-I$(top_srcdir)/include
+
+noinst_PROGRAMS = marcdump yaziconv
+
+marcdump_LDADD = libutil.la
+marcdump_SOURCES = marcdump.c
+
+yaziconv_LDADD = libutil.la
+yaziconv_SOURCES = siconvtst.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
+
+#libyazthread_la_SOURCES=nmemthread.c xmalloc.c log.c