X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile.am;h=08ae41a192b6003d6c7fc3dc36b5aeec85b84151;hb=8cb2e2a9699826bbc9a09d9eea1723cec3cd418c;hp=690bece8697c43b30bab52b52bd84ca98e418465;hpb=986cee5f65c6f0d5dde92b7fe2977a4532ecd3f9;p=yaz-moved-to-github.git

diff --git a/util/Makefile.am b/util/Makefile.am
index 690bece..08ae41a 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,22 +1,43 @@
-## Copyright (C) 1994-2000, Index Data
+## Copyright (C) 1995-2007, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.7 2000-05-18 11:57:05 adam Exp $
+## $Id: Makefile.am,v 1.32 2007-06-03 09:57:25 adam Exp $
 
-noinst_LTLIBRARIES = libutil.la
+bin_SCRIPTS = yaz-asncomp yaz-config
 
-bin_SCRIPTS = yaz-comp
+EXTRA_DIST = yaz-asncomp 
 
-EXTRA_DIST = yaz-comp
+DISTCLEANFILES = yaz-config
 
-LIBS =
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 
-INCLUDES =-I$(srcdir)/../include
+bin_PROGRAMS = yaz-marcdump yaz-iconv yaz-illclient
+noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark yaz-xmlquery
 
-noinst_PROGRAMS = marcdump
+# MARC dumper utility
+yaz_marcdump_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la
 
-marcdump_LDADD = libutil.la 
+# YAZ Iconv utility
+yaz_iconv_SOURCES = yaziconv.c
+yaz_iconv_LDADD = ../src/libyaz.la
 
-marcdump_SOURCES = marcdump.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 
+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)