X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile.am;h=e5a2eaa9674d4f646d3b1011680f185c8d7eb545;hb=0e48274dd7b0ba3fd4d3f91e898f3d28bdf23dfa;hp=010e9cc4acd0541360036167994954ccadb6060b;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1;p=yaz-moved-to-github.git

diff --git a/util/Makefile.am b/util/Makefile.am
index 010e9cc..e5a2eaa 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,28 +1,38 @@
-## Copyright (C) 1994-2000, Index Data
+## Copyright (C) 1994-2003, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.8 2000-11-23 10:58:33 adam Exp $
+## $Id: Makefile.am,v 1.24 2003-12-24 16:23:43 mike 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
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
-LIBS =
+bin_PROGRAMS = yaz-marcdump yaz-iconv
+noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark
 
-INCLUDES =-I$(srcdir)/../include
+# MARC dumper utility
+yaz_marcdump_LDADD = ../src/libyaz.la 
+yaz_marcdump_SOURCES = marcdump.c
 
-libyazthread_la_INCLUDES=-I$(srcdir)/../include
+# YAZ Iconv utility
+yaz_iconv_LDADD = ../src/libyaz.la 
+yaz_iconv_SOURCES = yaziconv.c
 
-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
+
+yaz_benchmark_LDADD = ../src/libyaz.la 
+yaz_benchmark_SOURCES = benchmark.c
 
-#libyazthread_la_SOURCES=nmemthread.c xmalloc.c log.c