Source restructure. yaz-marcdump part of installation

[yaz-moved-to-github.git] / util / Makefile.am

diff --git a/util/Makefile.am b/util/Makefile.am
index 781da6e..62796a0 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,26 +1,36 @@
-## Copyright (C) 1994-2001, Index Data
+## Copyright (C) 1994-2003, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.13 2002-09-11 21:25:57 adam Exp $
+## $Id: Makefile.am,v 1.23 2003-10-27 12:21:38 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-comp cvs-date.tcl
+EXTRA_DIST = yaz-asncomp 
 
 AM_CPPFLAGS=-I$(top_srcdir)/include
 
-noinst_PROGRAMS = marcdump yaziconv
+bin_PROGRAMS = yaz-marcdump yaz-iconv
+noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst
+
+# MARC dumper utility
+yaz_marcdump_LDADD = ../src/libyaz.la 
+yaz_marcdump_SOURCES = marcdump.c
+
+# YAZ Iconv utility
+yaz_iconv_LDADD = ../src/libyaz.la 
+yaz_iconv_SOURCES = yaziconv.c
+
+srwtst_SOURCES=srwtst.c
+srwtst_LDADD = ../src/libyaz.la
+
+cclsh_SOURCES=cclsh.c
+cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
-marcdump_LDADD = libutil.la 
-marcdump_SOURCES = marcdump.c
+cql2pqf_SOURCES = cql2pqf.c
+cql2pqf_LDADD = ../src/libyaz.la
 
-yaziconv_LDADD = libutil.la 
-yaziconv_SOURCES = siconvtst.c
+cql2xcql_SOURCES = cql2xcql.c
+cql2xcql_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 siconv.c
 
-#libyazthread_la_SOURCES=nmemthread.c xmalloc.c log.c