X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2FMakefile.am;h=f1fa8dd7bac118ad8b7db9e880b416015fd176b4;hp=781da6ea32cbd75fae3b282996216bf1644c6878;hb=a6d42174fde823c89a661c17be2165bce0d94870;hpb=4dd885245b0ce82b18609ab4a05d0d5868ff1391

diff --git a/util/Makefile.am b/util/Makefile.am
index 781da6e..f1fa8dd 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,26 +1,50 @@
-## Copyright (C) 1994-2001, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.13 2002-09-11 21:25:57 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1995-2010 Index Data
 
-noinst_LTLIBRARIES = libutil.la
+bin_SCRIPTS = yaz-asncomp yaz-config 
 
-#lib_LTLIBRARIES = libyazthread.la
+EXTRA_DIST = yaz-asncomp yaz-icu-example.xml
 
-bin_SCRIPTS = yaz-comp
+DISTCLEANFILES = yaz-config
 
-EXTRA_DIST = yaz-comp cvs-date.tcl
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(ICU_CPPFLAGS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include
+bin_PROGRAMS = yaz-marcdump yaz-iconv yaz-illclient yaz-icu yaz-json-parse
+noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark \
+ yaz-xmlquery
 
-noinst_PROGRAMS = marcdump yaziconv
+# MARC dumper utility
+yaz_marcdump_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la
 
-marcdump_LDADD = libutil.la 
-marcdump_SOURCES = marcdump.c
+# YAZ Iconv utility
+yaz_iconv_SOURCES = yaziconv.c
+yaz_iconv_LDADD = ../src/libyaz.la
 
-yaziconv_LDADD = libutil.la 
-yaziconv_SOURCES = siconvtst.c
+srwtst_SOURCES=srwtst.c
+srwtst_LDADD = ../src/libyaz.la
 
-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
+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
+
+yaz_icu_SOURCES = yaz-icu.c
+yaz_icu_LDADD =../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
+
+yaz_json_parse_SOURCES = json-parse.c
+yaz_json_parse_LDADD = ../src/libyaz.la
 
-#libyazthread_la_SOURCES=nmemthread.c xmalloc.c log.c