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

diff --git a/util/Makefile.am b/util/Makefile.am
index 953a563..3dfaba1 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,48 +1,40 @@
 ## Copyright (C) 1994-2003, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.22 2003-06-11 11:09:22 adam Exp $
-
-noinst_LTLIBRARIES = libutil.la
-
-check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf
+## $Id: Makefile.am,v 1.25 2004-03-10 17:18:08 adam Exp $
 
 TESTS = $(check_PROGRAMS)
 
-bin_SCRIPTS = yaz-asncomp
+bin_SCRIPTS = yaz-asncomp yaz-config
 
-EXTRA_DIST = yaz-asncomp cvs-date.tcl \
- charconv.tcl charconv.sgm charconv_cjk.xml
+EXTRA_DIST = yaz-asncomp 
+
+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
 
 # MARC dumper utility
-marcdump_LDADD = libutil.la 
-marcdump_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la 
+yaz_marcdump_SOURCES = marcdump.c
 
 # YAZ Iconv utility
-yaziconv_LDADD = libutil.la 
-yaziconv_SOURCES = yaziconv.c
-
-# Tests..
-tsticonv_LDADD = libutil.la
-tsticonv_SOURCES = tsticonv.c
+yaz_iconv_LDADD = ../src/libyaz.la 
+yaz_iconv_SOURCES = yaziconv.c
 
-tstnmem_LDADD = libutil.la
-tstnmem_SOURCES = tstnmem.c
+srwtst_SOURCES=srwtst.c
+srwtst_LDADD = ../src/libyaz.la
 
-tstmatchstr_LDADD = libutil.la
-tstmatchstr_SOURCES = tstmatchstr.c
+cclsh_SOURCES=cclsh.c
+cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
-tstwrbuf_LDADD = libutil.la
-tstwrbuf_SOURCES = tstwrbuf.c
+cql2pqf_SOURCES = cql2pqf.c
+cql2pqf_LDADD = ../src/libyaz.la
 
-# MARC8 conversion is generated from charconv.sgm
-marc8.c: charconv.sgm charconv.tcl
-	cd $(srcdir); ./charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+cql2xcql_SOURCES = cql2xcql.c
+cql2xcql_LDADD = ../src/libyaz.la
 
-libutil_la_SOURCES=version.c 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
+yaz_benchmark_LDADD = ../src/libyaz.la 
+yaz_benchmark_SOURCES = benchmark.c