X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=3810b5a9f80884f608321def3109a1eb7164b89c;hb=ee52d7a5f2325315de5391696bef64336ad88dbc;hp=1ef99f4c8375b2fd90582091062becac95c0e452;hpb=e23eae6ada71a70849bcdab7ee179579aad248e1;p=yaz-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 1ef99f4..3810b5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.13 2004-05-01 23:32:20 adam Exp $
+## $Id: Makefile.am,v 1.19 2005-04-11 08:41:39 adam Exp $
 
 if ISTHR
 thrlib=libyazthread.la
@@ -10,7 +10,8 @@ YAZ_VERSION_INFO=2:0:0
 
 lib_LTLIBRARIES = libyaz.la $(thrlib) 
 
-TESTS = $(check_PROGRAMS)
+dist-hook:
+	test -f cql.c || exit 1
 
 tabdatadir = $(pkgdatadir)/z39.50
 tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
@@ -20,18 +21,18 @@ illdatadir=$(pkgdatadir)/ill
 illdata_DATA=ill9702.asn item-req.asn ill.tcl
 
 EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
- charconv.tcl codetables.xml charconv.sgm
+ charconv.tcl codetables.xml
 
 YAZCOMP = $(top_srcdir)/util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) 
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
 AM_YFLAGS=-p cql_
 THREADED_FLAGS = @CFLAGSTHREADS@
 
-# MARC8 conversion is generated from charconv.sgm + codetables.xml
-marc8.c: charconv.tcl charconv.sgm codetables.xml
-	cd $(srcdir); ./charconv.tcl -O 1 -p marc8 charconv.sgm codetables.xml -o marc8.c
+# MARC8 conversion is generated from codetables.xml
+marc8.c: charconv.tcl codetables.xml
+	cd $(srcdir); ./charconv.tcl -p marc8 codetables.xml -o marc8.c
 
 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 \
@@ -50,7 +51,7 @@ libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
   z-charneg.c \
   prt-ext.c \
   ill-core.c item-req.c ill-get.c \
-  zget.c yaz-ccl.c diagbib1.c logrpn.c \
+  zget.c yaz-ccl.c diagbib1.c diagsrw.c logrpn.c \
   otherinfo.c pquery.c sortspec.c z3950oid.c charneg.c initopt.c \
   zoom-c.c zoom-opt.c zoom-p.h grs1disp.c zgdu.c soap.c srw.c srwutil.c \
   opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \