Added check for tclsh programs

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 3ccaf39..fd86131 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2006, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.34 2006-05-03 09:04:33 heikki Exp $
+## $Id: Makefile.am,v 1.37 2006-05-23 09:13:50 adam Exp $
 
 YAZ_VERSION_INFO=2:1:0
 
@@ -22,7 +22,7 @@ EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
  csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv
 
 YAZCOMP = ../util/yaz-asncomp
-YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
+YAZCOMPLINE = $(TCLSH) $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
 AM_CFLAGS=$(THREAD_CFLAGS)
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
@@ -31,18 +31,18 @@ AM_YFLAGS=-p cql_
 
 # MARC8->UTF8 conversion is generated from codetables.xml
 $(srcdir)/marc8.c: charconv.tcl codetables.xml
-       cd $(srcdir); ./charconv.tcl -p marc8 codetables.xml -o marc8.c
+       cd $(srcdir); $(TCLSH) ./charconv.tcl -p marc8 codetables.xml -o marc8.c
 
 # UTF-8->MARC8 conversion is generated from codetables.xml
 $(srcdir)/marc8r.c: charconv.tcl codetables.xml
-       cd $(srcdir); ./charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
+       cd $(srcdir); $(TCLSH) ./charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
 
 # Generate diagnostics from CSVs
 $(top_srcdir)/include/yaz/diagbib1.h $(srcdir)/diagbib1.c: csvtobib1.tcl bib1.csv
-       cd $(srcdir); ./csvtobib1.tcl
+       cd $(srcdir); $(TCLSH) ./csvtobib1.tcl
 
 $(top_srcdir)/include/yaz/diagsrw.h $(srcdir)/diagsrw.c: csvtosrw.tcl srw.csv
-       cd $(srcdir); ./csvtosrw.tcl
+       cd $(srcdir); $(TCLSH) ./csvtosrw.tcl
 
 libyaz_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 \
@@ -51,7 +51,7 @@ libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
   odr_null.c ber_null.c odr_int.c ber_int.c odr_tag.c odr_cons.c \
   odr_seq.c odr_oct.c ber_oct.c odr_bit.c ber_bit.c odr_oid.c \
   ber_oid.c odr_use.c odr_choice.c odr_any.c ber_any.c odr.c odr_mem.c \
-  dumpber.c odr_enum.c odr-priv.h \
+  dumpber.c odr_enum.c odr-priv.h libxml2_error.c \
   comstack.c tcpip.c waislen.c unix.c \
   z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \
   z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
@@ -73,7 +73,7 @@ libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
   xmlquery.c \
   mime.c mime.h \
   nfa.c \
-  record_conv.c 
+  record_conv.c retrieval.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)