X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2FMakefile.am;h=ce451b3cdfa41511607b953b25b3a4fc2af5e057;hp=4f6ad7857bcff628a1fb12da8ee4919d110dc8b6;hb=0ffb25b0bf78f53399267664b71206c88980c4da;hpb=d96213e7e29deb01d3f24408b557319adea3cb3d

diff --git a/util/Makefile.am b/util/Makefile.am
index 4f6ad78..ce451b3 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,28 +1,47 @@
-## Copyright (C) 1994-2001, Index Data
+## Copyright (C) 1995-2007, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.10 2001-05-16 07:37:39 adam Exp $
+## $Id: Makefile.am,v 1.33 2007-10-22 12:21:40 adam Exp $
 
-noinst_LTLIBRARIES = libutil.la
+bin_SCRIPTS = yaz-asncomp yaz-config
 
-#lib_LTLIBRARIES = libyazthread.la
+EXTRA_DIST = yaz-asncomp yaz-icu-example.xml
 
-bin_SCRIPTS = yaz-comp
+DISTCLEANFILES = yaz-config
 
-EXTRA_DIST = yaz-comp cvs-date.tcl
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
+yaz_icu_CPPFLAGS=$(AM_CPPFLAGS) $(ICU_CPPFLAGS)
 
-LIBS =
+bin_PROGRAMS = yaz-marcdump yaz-iconv yaz-illclient yaz-icu
+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
+
+yaz_illclient_SOURCES = yaz-illclient.c
+yaz_illclient_LDADD = ../src/libyaz.la $(READLINE_LIBS)
+
+yaz_icu_SOURCES = yaz-icu.c
+yaz_icu_LDADD =../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)