projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in CCL parser that could caused uninialized values
[yaz-moved-to-github.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
de8916d
..
3810b5a
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,20
+1,17
@@
## Copyright (C) 1994-2004, Index Data
## All rights reserved.
## Copyright (C) 1994-2004, Index Data
## All rights reserved.
-## $Id: Makefile.am,v 1.10 2004-03-16 13:12:42 adam Exp $
+## $Id: Makefile.am,v 1.19 2005-04-11 08:41:39 adam Exp $
if ISTHR
thrlib=libyazthread.la
endif
if ISTHR
thrlib=libyazthread.la
endif
-if ISSSL
-ssllib=libyazssl.la
-endif
-
YAZ_VERSION_INFO=2:0:0
YAZ_VERSION_INFO=2:0:0
-lib_LTLIBRARIES = libyaz.la $(thrlib) $(ssllib)
+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 \
tabdatadir = $(pkgdatadir)/z39.50
tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
@@
-24,18
+21,18
@@
illdatadir=$(pkgdatadir)/ill
illdata_DATA=ill9702.asn item-req.asn ill.tcl
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
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)
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@
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 -s 50 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 \
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 \
@@
-54,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 \
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 \
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 \
@@
-69,10
+66,6
@@
libyazthread_la_SOURCES=
libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
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 \
# Rules for Z39.50 V3
$(srcdir)/z-accdes1.c \
$(srcdir)/z-accform1.c \
@@
-157,11
+150,4
@@
thr-statserv.lo: statserv.c
thr-eventl.lo: eventl.c
$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/eventl.c -o thr-eventl.lo
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
-