X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile.am;h=3dfaba1d36f774ed42d839911f59e9a6f6cce7d7;hb=fa1dff894130765cb4a8fed41c42fc7125702c9c;hp=c72fc55ba0dd272781858baee514342fe55eb813;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;p=yaz-moved-to-github.git

diff --git a/util/Makefile.am b/util/Makefile.am
index c72fc55..3dfaba1 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,28 +1,40 @@
 ## Copyright (C) 1994-2003, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.15 2003-01-06 08:20:28 adam Exp $
+## $Id: Makefile.am,v 1.25 2004-03-10 17:18:08 adam Exp $
 
-noinst_LTLIBRARIES = libutil.la
+TESTS = $(check_PROGRAMS)
 
-#lib_LTLIBRARIES = libyazthread.la
+bin_SCRIPTS = yaz-asncomp yaz-config
 
-bin_SCRIPTS = yaz-comp
+EXTRA_DIST = yaz-asncomp 
 
-EXTRA_DIST = yaz-comp cvs-date.tcl charconv.tcl charconv.sgm
+DISTCLEANFILES = yaz-config
 
 AM_CPPFLAGS=-I$(top_srcdir)/include
 
-noinst_PROGRAMS = marcdump yaziconv
+bin_PROGRAMS = yaz-marcdump yaz-iconv
+noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark
 
-marcdump_LDADD = libutil.la 
-marcdump_SOURCES = marcdump.c
+# MARC dumper utility
+yaz_marcdump_LDADD = ../src/libyaz.la 
+yaz_marcdump_SOURCES = marcdump.c
 
-yaziconv_LDADD = libutil.la 
-yaziconv_SOURCES = siconvtst.c
+# YAZ Iconv utility
+yaz_iconv_LDADD = ../src/libyaz.la 
+yaz_iconv_SOURCES = yaziconv.c
 
-marc8.c: charconv.sgm charconv.tcl
-	cd $(srcdir); ./charconv.tcl -p marc8 -s 50 charconv.sgm marc8.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 marc8.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_LDADD = ../src/libyaz.la 
+yaz_benchmark_SOURCES = benchmark.c