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
Code updates which makes things compile as C++. Mostly type casts were
[yaz-moved-to-github.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
8ee4ef9
..
576559a
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,11
+1,10
@@
## This file is part of the YAZ toolkit.
## Copyright (C) 1995-2007, Index Data, All rights reserved.
## This file is part of the YAZ toolkit.
## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.61 2007-04-17 20:26:18 adam Exp $
+## $Id: Makefile.am,v 1.67 2007-05-01 12:22:11 adam Exp $
YAZ_VERSION_INFO=3:0:0
lib_LTLIBRARIES = libyaz.la libyaz_server.la
YAZ_VERSION_INFO=3:0:0
lib_LTLIBRARIES = libyaz.la libyaz_server.la
-# noinst_PROGRAMS = cqlparse
dist-hook:
test -f $(srcdir)/cql.c || exit 1
dist-hook:
test -f $(srcdir)/cql.c || exit 1
@@
-15,7
+14,7
@@
tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
illdatadir=$(pkgdatadir)/ill
esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
illdatadir=$(pkgdatadir)/ill
-illdata_DATA=ill9702.asn item-req.asn ill.tcl
+illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
charconv.tcl codetables.xml \
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
charconv.tcl codetables.xml \
@@
-43,7
+42,7
@@
marc8r.c: charconv.tcl codetables.xml
# Generate OID database from CSV
oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
# Generate OID database from CSV
oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
- $(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir)/oid.csv $(srcdir)/oid_std.c $(top_srcdir)/include/yaz/oid_std.h
+ $(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir) oid.csv oid_std.c oid_std.h
# Generate diagnostics from CSVs
diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
# Generate diagnostics from CSVs
diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
@@
-65,7
+64,7
@@
GEN_FILES = oid_std.c \
zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c zes-admin.c \
z-charneg.c \
zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c zes-admin.c \
z-charneg.c \
- ill-core.c item-req.c
+ ill-core.c item-req.c oclc-ill-req-ext.c
libyaz_la_SOURCES=version.c options.c log.c \
$(GEN_FILES) \
libyaz_la_SOURCES=version.c options.c log.c \
$(GEN_FILES) \
@@
-86,15
+85,16
@@
libyaz_la_SOURCES=version.c options.c log.c \
otherinfo.c pquery.c sortspec.c charneg.c initopt.c \
zoom-c.c zoom-socket.c zoom-opt.c zoom-p.h \
grs1disp.c zgdu.c soap.c srw.c srwutil.c \
otherinfo.c pquery.c sortspec.c charneg.c initopt.c \
zoom-c.c zoom-socket.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 cclxmlconfig.c \
+ opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c cclp.h \
+ cclqfile.c cclstr.c cclxmlconfig.c ccl_stop_words.c \
cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
cqlstrer.c querytowrbuf.c \
tcpdchk.c \
test.c timing.c \
xmlquery.c http.c \
cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
cqlstrer.c querytowrbuf.c \
tcpdchk.c \
test.c timing.c \
xmlquery.c http.c \
- mime.c mime.h oid_util.c \
- record_conv.c retrieval.c elementset.c snprintf.c query-charset.c
+ mime.c mime.h oid_util.c tokenizer.c \
+ record_conv.c retrieval.c elementset.c snprintf.c query-charset.c \
+ copy_types.c
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
@@
-178,11
+178,15
@@
$(top_srcdir)/include/yaz/ill-core.h: \
$(srcdir)/ill.tcl $(srcdir)/ill9702.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_I) $(srcdir)/ill9702.asn
$(srcdir)/ill.tcl $(srcdir)/ill9702.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_I) $(srcdir)/ill9702.asn
+# OCLC ILL Request Extension
+oclc-ill-req-ext.c \
+$(top_srcdir)/include/yaz/oclc-ill-req-ext.h: \
+$(srcdir)/ill.tcl $(srcdir)/oclc-ill-req-ext.asn $(YAZCOMP)
+ $(TCLSH) $(YAZCOMP_I) $(srcdir)/oclc-ill-req-ext.asn
+
# Item Request
item-req.c \
$(top_srcdir)/include/yaz/item-req.h: \
$(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
# Item Request
item-req.c \
$(top_srcdir)/include/yaz/item-req.h: \
$(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
-# cqlparse_SOURCES = cqlstd.y
-