Get rid of SSL_{CFLAGS,DEFS,LIBS}

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

diff --git a/util/Makefile.am b/util/Makefile.am
index 3d72fc8..af3919f 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,47 +1,40 @@
-## Copyright (C) 1994-2003, Index Data
+## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.19 2003-05-22 22:44:50 adam Exp $
-
-noinst_LTLIBRARIES = libutil.la
-
-check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf
+## $Id: Makefile.am,v 1.27 2004-05-01 23:32:20 adam Exp $
 
 TESTS = $(check_PROGRAMS)
 
-bin_SCRIPTS = yaz-comp
+bin_SCRIPTS = yaz-asncomp yaz-config
 
-EXTRA_DIST = yaz-comp cvs-date.tcl charconv.tcl charconv.sgm
+EXTRA_DIST = yaz-asncomp 
+
+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
 
 # MARC dumper utility
-marcdump_LDADD = libutil.la 
-marcdump_SOURCES = marcdump.c
+yaz_marcdump_SOURCES = marcdump.c
+yaz_marcdump_LDADD = ../src/libyaz.la
 
 # YAZ Iconv utility
-yaziconv_LDADD = libutil.la 
-yaziconv_SOURCES = yaziconv.c
-
-# Tests..
-tsticonv_LDADD = libutil.la
-tsticonv_SOURCES = tsticonv.c
+yaz_iconv_SOURCES = yaziconv.c
+yaz_iconv_LDADD = ../src/libyaz.la
 
-tstnmem_LDADD = libutil.la
-tstnmem_SOURCES = tstnmem.c
+srwtst_SOURCES=srwtst.c
+srwtst_LDADD = ../src/libyaz.la
 
-tstmatchstr_LDADD = libutil.la
-tstmatchstr_SOURCES = tstmatchstr.c
+cclsh_SOURCES=cclsh.c
+cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
-tstwrbuf_LDADD = libutil.la
-tstwrbuf_SOURCES = tstwrbuf.c
+cql2pqf_SOURCES = cql2pqf.c
+cql2pqf_LDADD = ../src/libyaz.la
 
-# MARC8 C conversion is generated from charconv.sgm
-marc8.c: charconv.sgm charconv.tcl
-       cd $(srcdir); ./charconv.tcl -p marc8 -s 50 charconv.sgm marc8.c
+cql2xcql_SOURCES = cql2xcql.c
+cql2xcql_LDADD = ../src/libyaz.la
 
-libutil_la_SOURCES=version.c 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
+yaz_benchmark_SOURCES = benchmark.c
+yaz_benchmark_LDADD = ../src/libyaz.la