X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=d2e4c83c8383e71e092ec33c031da9e766d03f88;hb=5c3d2d2ab097e4bb59ba5718a396b020a2d302c0;hp=81b111d56c1bf589eb368b82b5b29d3edec47bfa;hpb=00106dc85fcaa3b02f9a0d471ea90a594bf3a175;p=yaz-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 81b111d..d2e4c83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,14 @@
-## Copyright (C) 1994-2003, Index Data
+## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.8 2004-03-15 21:39:06 adam Exp $
+## $Id: Makefile.am,v 1.18 2004-11-21 21:56:28 adam Exp $
 
 if ISTHR
 thrlib=libyazthread.la
 endif
 
-if ISSSL
-ssllib=libyazssl.la
-endif
-
 YAZ_VERSION_INFO=2:0:0
 
-lib_LTLIBRARIES = libyaz.la $(thrlib) $(ssllib)
-
-TESTS = $(check_PROGRAMS)
+lib_LTLIBRARIES = libyaz.la $(thrlib) 
 
 tabdatadir = $(pkgdatadir)/z39.50
 tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
@@ -24,26 +18,22 @@ 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
 
 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
-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
-marc8_cjk.c: charconv_cjk.xml charconv.tcl
-	cd $(srcdir); ./charconv.tcl -p marc8_cjk -s 50 charconv_cjk.xml -o marc8_cjk.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 \
-  siconv.c marc8.c marc8_cjk.c \
+  siconv.c marc8.c \
   odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.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 \
@@ -58,7 +48,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 \
@@ -73,10 +63,6 @@ libyazthread_la_SOURCES=
 libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
 libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-libyazssl_la_SOURCES=
-libyazssl_la_LIBADD=ssl-comstack.lo ssl-tcpip.lo
-libyazssl_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-
 # Rules for Z39.50 V3
 $(srcdir)/z-accdes1.c \
 $(srcdir)/z-accform1.c \
@@ -161,11 +147,4 @@ thr-statserv.lo: statserv.c
 thr-eventl.lo: eventl.c
 	$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/eventl.c -o thr-eventl.lo
 
-# SSL versions of objects.
-ssl-comstack.lo: comstack.c
-	$(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/comstack.c -o ssl-comstack.lo
-
-ssl-tcpip.lo: tcpip.c
-	$(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/tcpip.c -o ssl-tcpip.lo
-