X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile.am;h=a53da0be73f64f5621e31b63432c3541c9922108;hb=e8ac1e56929fe175624fb63e619c184b58ef63b9;hp=c023e994cfedbcd3d886d1252ed03291eb7f5fc7;hpb=26d07328e36c41d39216d66d742d133cf7512995;p=yaz-moved-to-github.git

diff --git a/util/Makefile.am b/util/Makefile.am
index c023e99..a53da0b 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,28 +1,40 @@
-## Copyright (C) 1994-2001, Index Data
+## Copyright (C) 1994-2006, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.9 2001-03-21 15:02:39 adam Exp $
+## $Id: Makefile.am,v 1.29 2006-02-23 10:40:59 adam Exp $
 
-noinst_LTLIBRARIES = libutil.la
+bin_SCRIPTS = yaz-asncomp yaz-config
 
-#lib_LTLIBRARIES = libyazthread.la
+EXTRA_DIST = yaz-asncomp 
 
-bin_SCRIPTS = yaz-comp
+DISTCLEANFILES = yaz-config
 
-EXTRA_DIST = yaz-comp
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 
-LIBS =
+bin_PROGRAMS = yaz-marcdump yaz-iconv
+noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark yaz-xmlquery
 
-INCLUDES =-I$(top_srcdir)/include
+# MARC dumper utility
+yaz_marcdump_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la
 
-libyazthread_la_INCLUDES=-I$(top_srcdir)/include
+# YAZ Iconv utility
+yaz_iconv_SOURCES = yaziconv.c
+yaz_iconv_LDADD = ../src/libyaz.la
 
-noinst_PROGRAMS = marcdump
+srwtst_SOURCES=srwtst.c
+srwtst_LDADD = ../src/libyaz.la
 
-marcdump_LDADD = libutil.la 
+cclsh_SOURCES=cclsh.c
+cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
-marcdump_SOURCES = marcdump.c
+cql2pqf_SOURCES = cql2pqf.c
+cql2pqf_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 
+cql2xcql_SOURCES = cql2xcql.c
+cql2xcql_LDADD = ../src/libyaz.la
 
-#libyazthread_la_SOURCES=nmemthread.c xmalloc.c log.c
+yaz_benchmark_SOURCES = benchmark.c
+yaz_benchmark_LDADD = ../src/libyaz.la
+
+yaz_xmlquery_SOURCES = yaz-xmlquery.c
+yaz_xmlquery_LDADD = ../src/libyaz.la