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
Refactor ZOOM Z39.50 functions to zoom-z3950.c
[yaz-moved-to-github.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
9f8c018
..
4fbb1b3
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,5
+1,5
@@
## This file is part of the YAZ toolkit.
## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2009 Index Data
+## Copyright (C) 1995-2010 Index Data
YAZ_VERSION_INFO=4:0:0
YAZ_VERSION_INFO=4:0:0
@@
-10,7
+10,7
@@
dist-hook:
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 \
- esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
+ esadmin.asn charneg-3.asn mterm2.asn oclcui.asn facet.asn
illdatadir=$(pkgdatadir)/ill
illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
illdatadir=$(pkgdatadir)/ill
illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
@@
-26,8
+26,7
@@
YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I$(top_srcdir)/include
YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
-libyaz_la_LIBADD = $(SSL_LIBS)
-libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
+libyaz_la_LIBADD = $(SSL_LIBS) $(TCPD_LIBS)
libyaz_server_la_LIBADD = libyaz.la
libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
libyaz_server_la_LIBADD = libyaz.la
libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
@@
-64,7
+63,7
@@
diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl
GEN_FILES = oid_std.c \
marc8.c marc8r.c iso5426.c \
diagbib1.c diagsrw.c diagsru_update.c \
GEN_FILES = oid_std.c \
marc8.c marc8r.c iso5426.c \
diagbib1.c diagsrw.c diagsru_update.c \
- z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \
+ z-accdes1.c z-accform1.c z-acckrb1.c z-core.c z-facet-1.c \
z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c z-oclcui.c\
zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c z-oclcui.c\
zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
@@
-78,18
+77,18
@@
libyaz_la_SOURCES=version.c options.c log.c \
wrbuf.c oid_db.c errno.c \
nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
siconv.c iconv-p.h utf8.c ucs4.c iso5428.c advancegreek.c \
wrbuf.c oid_db.c errno.c \
nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
siconv.c iconv-p.h utf8.c ucs4.c iso5428.c advancegreek.c \
- odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.c \
+ odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.c facet.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 \
ber_oid.c odr_use.c odr_choice.c odr_any.c ber_any.c odr.c odr_mem.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 \
ber_oid.c odr_use.c odr_choice.c odr_any.c ber_any.c odr.c odr_mem.c \
- dumpber.c odr_enum.c odr-priv.h libxml2_error.c \
+ dumpber.c odr_enum.c odr-priv.h \
comstack.c tcpip.c waislen.c unix.c \
prt-ext.c \
ill-get.c \
zget.c yaz-ccl.c diag-entry.c diag-entry.h \
logrpn.c \
otherinfo.c pquery.c sortspec.c charneg.c initopt.c \
comstack.c tcpip.c waislen.c unix.c \
prt-ext.c \
ill-get.c \
zget.c yaz-ccl.c diag-entry.c diag-entry.h \
logrpn.c \
otherinfo.c pquery.c sortspec.c charneg.c initopt.c \
- zoom-c.c zoom-socket.c zoom-opt.c zoom-p.h \
+ zoom-c.c zoom-z3950.c zoom-socket.c zoom-opt.c zoom-p.h \
grs1disp.c zgdu.c soap.c srw.c srwutil.c uri.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 \
grs1disp.c zgdu.c soap.c srw.c srwutil.c uri.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 \
@@
-102,16
+101,19
@@
libyaz_la_SOURCES=version.c options.c log.c \
record_conv.c retrieval.c elementset.c snprintf.c query-charset.c \
copy_types.c match_glob.c poll.c daemon.c \
iconv_encode_marc8.c iconv_encode_iso_8859_1.c iconv_encode_wchar.c \
record_conv.c retrieval.c elementset.c snprintf.c query-charset.c \
copy_types.c match_glob.c poll.c daemon.c \
iconv_encode_marc8.c iconv_encode_iso_8859_1.c iconv_encode_wchar.c \
- iconv_decode_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.c
+ iconv_decode_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.c \
+ json.c xml_include.c file_glob.c dirent.c mutex-p.h mutex.c condvar.c \
+ thread_id.c gettimeofday.c thread_create.c spipe.c
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
- requestq.c eventl.h session.h mutex.c
+ requestq.c eventl.h session.h
libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-libyaz_icu_la_SOURCES = icu_I18N.c
+libyaz_icu_la_SOURCES = icu_chain.c icu_utf16.c icu_utf8.c \
+ icu_transform.c icu_casemap.c icu_tokenizer.c icu_sortkey.c
libyaz_icu_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
# Rules for Z39.50 V3
libyaz_icu_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
# Rules for Z39.50 V3
@@
-183,6
+185,12
@@
$(top_srcdir)/include/yaz/z-oclcui.h: \
$(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/oclcui.asn
$(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/oclcui.asn
+# UserInfoFormat-facet-1
+z-facet-1.c \
+$(top_srcdir)/include/yaz/z-facet-1.h: $(srcdir)/facet.asn $(YAZCOMP)
+ $(TCLSH) $(YAZCOMP_Z) $(srcdir)/facet.asn
+
+
# ILL protocol
ill-core.c \
$(top_srcdir)/include/yaz/ill-core.h: \
# ILL protocol
ill-core.c \
$(top_srcdir)/include/yaz/ill-core.h: \
@@
-201,3
+209,4
@@
$(top_srcdir)/include/yaz/item-req.h: \
$(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
$(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
+