X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=9f8962ec7947d6f16e5547a68c78a3a98b10e38d;hb=8746c08e36ba07edc839f1396c17a27ea2915dc0;hp=d4744fb15869915b6cc8b192b94e5bac41b72cfd;hpb=c82bbc07fb53f78aab88bb4121629daeef42ed2a;p=yaz-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index d4744fb..9f8962e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-## Copyright (C) 1994-2003, Index Data
+## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.3 2004-01-05 09:34:42 adam Exp $
+## $Id: Makefile.am,v 1.11 2004-03-17 11:00:04 adam Exp $
 
 if ISTHR
 thrlib=libyazthread.la
@@ -24,18 +24,18 @@ illdatadir=$(pkgdatadir)/ill
 illdata_DATA=ill9702.asn item-req.asn ill.tcl
 
 EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
- charconv.tcl charconv.sgm charconv_cjk.xml 
+ charconv.tcl codetables.xml charconv.sgm
 
 YAZCOMP = $(top_srcdir)/util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XSLT_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 AM_YFLAGS=-p cql_
 THREADED_FLAGS = @CFLAGSTHREADS@
 
-# 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
+# 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
 
 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 \
@@ -55,12 +55,12 @@ libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
   prt-ext.c \
   ill-core.c item-req.c ill-get.c \
   zget.c yaz-ccl.c diagbib1.c logrpn.c \
-  otherinfo.c pquery.c sortspec.c z3950oid.c charneg.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 \
   cclqfile.c cclstr.c \
   cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
-  cqlstrer.c lexer.h \
+  cqlstrer.c \
   eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
   eventl.h service.c service.h session.h
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
@@ -159,9 +159,9 @@ thr-eventl.lo: eventl.c
 
 # SSL versions of objects.
 ssl-comstack.lo: comstack.c
-	$(LTCOMPILE) $(SSL_FLAGS) -c $(srcdir)/comstack.c -o ssl-comstack.lo
+	$(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/comstack.c -o ssl-comstack.lo
 
 ssl-tcpip.lo: tcpip.c
-	$(LTCOMPILE) $(SSL_FLAGS) -c $(srcdir)/tcpip.c -o ssl-tcpip.lo
+	$(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/tcpip.c -o ssl-tcpip.lo