-# Copyright (C) 1994-2000, Index Data
-# All rights reserved.
-# $Id: Makefile.am,v 1.1 2000-02-28 11:20:06 adam Exp $
+## Copyright (C) 1995-2007, Index Data
+## All rights reserved.
+## $Id: Makefile.am,v 1.36 2007-11-12 11:14:49 adam Exp $
-noinst_LIBRARIES = libutil.a
-EXTRA_DIST=yc.tcl
+bin_SCRIPTS = yaz-asncomp yaz-config
-INCLUDES=-I../include
-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-asncomp yaz-icu-example.xml
+
+DISTCLEANFILES = yaz-config
+
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(ICU_CPPFLAGS)
+
+bin_PROGRAMS = yaz-marcdump yaz-iconv yaz-illclient yaz-icu
+noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark \
+ yaz-xmlquery
+
+# MARC dumper utility
+yaz_marcdump_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la
+
+# YAZ Iconv utility
+yaz_iconv_SOURCES = yaziconv.c
+yaz_iconv_LDADD = ../src/libyaz.la
+
+srwtst_SOURCES=srwtst.c
+srwtst_LDADD = ../src/libyaz.la
+
+cclsh_SOURCES=cclsh.c
+cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS)
+
+cql2pqf_SOURCES = cql2pqf.c
+cql2pqf_LDADD = ../src/libyaz.la
+
+cql2xcql_SOURCES = cql2xcql.c
+cql2xcql_LDADD = ../src/libyaz.la
+
+yaz_benchmark_SOURCES = benchmark.c
+yaz_benchmark_LDADD = ../src/libyaz.la
+
+yaz_xmlquery_SOURCES = yaz-xmlquery.c
+yaz_xmlquery_LDADD = ../src/libyaz.la
+
+yaz_illclient_SOURCES = yaz-illclient.c
+yaz_illclient_LDADD = ../src/libyaz.la $(READLINE_LIBS)
+
+yaz_icu_SOURCES = yaz-icu.c
+yaz_icu_LDADD =../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)