X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2FMakefile.am;h=e72ae1ca40713b58124b9de0da16afadb4ccad60;hp=d2bb9bf32a38ab382f8606848c2397fe4ecb6530;hb=e72e394106dd25d6a8a8c7c2fa677f40ef5e7eb6;hpb=1121eeb134f61c6c2510143858db59045c1b6757

diff --git a/util/Makefile.am b/util/Makefile.am
index d2bb9bf..e72ae1c 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,28 +1,40 @@
-## Copyright (C) 1994-2002, Index Data
+## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.14 2002-12-16 13:13:53 adam Exp $
+## $Id: Makefile.am,v 1.26 2004-04-28 22:45:00 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_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la $(SSL_LIBS)
 
-yaziconv_LDADD = libutil.la 
-yaziconv_SOURCES = siconvtst.c
+# YAZ Iconv utility
+yaz_iconv_SOURCES = yaziconv.c
+yaz_iconv_LDADD = ../src/libyaz.la $(SSL_LIBS)
 
-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 $(SSL_LIBS)
 
-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) $(SSL_LIBS)
+
+cql2pqf_SOURCES = cql2pqf.c
+cql2pqf_LDADD = ../src/libyaz.la $(SSL_LIBS)
+
+cql2xcql_SOURCES = cql2xcql.c
+cql2xcql_LDADD = ../src/libyaz.la $(SSL_LIBS)
+
+yaz_benchmark_SOURCES = benchmark.c
+yaz_benchmark_LDADD = ../src/libyaz.la $(SSL_LIBS)