X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile.am;h=953a5631bc67d6dc09a55c2b868c49e063782522;hb=4b3d1e197d75fcb2607be8d86d244f20c4180000;hp=5d908210ddca879d9b4ea79b67e3c67088d93a23;hpb=47f8bbd041e610b13dd25153872dfef2aa288c52;p=yaz-moved-to-github.git

diff --git a/util/Makefile.am b/util/Makefile.am
index 5d90821..953a563 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,26 +1,48 @@
-## Copyright (C) 1994-2001, Index Data
+## Copyright (C) 1994-2003, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.11 2002-04-15 09:44:44 adam Exp $
+## $Id: Makefile.am,v 1.22 2003-06-11 11:09:22 adam Exp $
 
 noinst_LTLIBRARIES = libutil.la
 
-#lib_LTLIBRARIES = libyazthread.la
+check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf
 
-bin_SCRIPTS = yaz-comp
+TESTS = $(check_PROGRAMS)
 
-EXTRA_DIST = yaz-comp cvs-date.tcl
+bin_SCRIPTS = yaz-asncomp
 
-LIBS =
+EXTRA_DIST = yaz-asncomp cvs-date.tcl \
+ charconv.tcl charconv.sgm charconv_cjk.xml
 
 AM_CPPFLAGS=-I$(top_srcdir)/include
 
-noinst_PROGRAMS = marcdump
+noinst_PROGRAMS = marcdump yaziconv
 
+# MARC dumper utility
 marcdump_LDADD = libutil.la 
-
 marcdump_SOURCES = marcdump.c
 
-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 
+# YAZ Iconv utility
+yaziconv_LDADD = libutil.la 
+yaziconv_SOURCES = yaziconv.c
+
+# Tests..
+tsticonv_LDADD = libutil.la
+tsticonv_SOURCES = tsticonv.c
+
+tstnmem_LDADD = libutil.la
+tstnmem_SOURCES = tstnmem.c
+
+tstmatchstr_LDADD = libutil.la
+tstmatchstr_SOURCES = tstmatchstr.c
+
+tstwrbuf_LDADD = libutil.la
+tstwrbuf_SOURCES = tstwrbuf.c
+
+# MARC8 conversion is generated from charconv.sgm
+marc8.c: charconv.sgm charconv.tcl
+	cd $(srcdir); ./charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+
+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
 
-#libyazthread_la_SOURCES=nmemthread.c xmalloc.c log.c