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 comment regarding diagnostics
[yaz-moved-to-github.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
576559a
..
90bce9e
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,10
+1,9
@@
## This file is part of the YAZ toolkit.
## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.67 2007-05-01 12:22:11 adam Exp $
+## Copyright (C) 1995-2008 Index Data
YAZ_VERSION_INFO=3:0:0
YAZ_VERSION_INFO=3:0:0
-lib_LTLIBRARIES = libyaz.la libyaz_server.la
+lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la
dist-hook:
test -f $(srcdir)/cql.c || exit 1
dist-hook:
test -f $(srcdir)/cql.c || exit 1
@@
-20,7
+19,7
@@
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
charconv.tcl codetables.xml \
csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv \
csvtosru_update.tcl sru_update.csv \
charconv.tcl codetables.xml \
csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv \
csvtosru_update.tcl sru_update.csv \
- oidtoc.tcl oid.csv
+ oidtoc.tcl oid.csv sc_test.c
YAZCOMP=$(top_srcdir)/util/yaz-asncomp
YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I$(top_srcdir)/include
YAZCOMP=$(top_srcdir)/util/yaz-asncomp
YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I$(top_srcdir)/include
@@
-28,7
+27,9
@@
YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
-
+libyaz_server_la_LIBADD = libyaz.la
+libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
+libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
AM_YFLAGS=-p cql_
AM_YFLAGS=-p cql_
@@
-42,7
+43,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 oid_std.c oid_std.h
+ $(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir) $(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
@@
-71,7
+72,7
@@
libyaz_la_SOURCES=version.c options.c log.c \
marcdisp.c marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
wrbuf.c oid_db.c \
nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
marcdisp.c marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
wrbuf.c oid_db.c \
nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
- siconv.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_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 \
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 \
@@
-87,27
+88,31
@@
libyaz_la_SOURCES=version.c options.c log.c \
grs1disp.c zgdu.c soap.c srw.c srwutil.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 \
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 \
+ cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c rpn2cql.c \
cqlstrer.c querytowrbuf.c \
tcpdchk.c \
test.c timing.c \
cqlstrer.c querytowrbuf.c \
tcpdchk.c \
test.c timing.c \
- xmlquery.c http.c \
+ xmlquery.c xmlerror.c http.c \
mime.c mime.h oid_util.c tokenizer.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
+ 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 sc.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 service.c service.h mutex.c
+ requestq.c eventl.h session.h mutex.c
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_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
+
# Rules for Z39.50 V3
z-accdes1.c \
z-accform1.c \
z-acckrb1.c \
# Rules for Z39.50 V3
z-accdes1.c \
z-accform1.c \
z-acckrb1.c \
-z-core.c \
z-diag1.c \
z-espec1.c \
z-estask.c \
z-diag1.c \
z-espec1.c \
z-estask.c \
@@
-127,8
+132,9
@@
zes-psched.c \
zes-pset.c \
zes-update0.c \
$(top_srcdir)/include/yaz/z-accdes1.h \
zes-pset.c \
zes-update0.c \
$(top_srcdir)/include/yaz/z-accdes1.h \
-$(top_srcdir)/include/yaz/z-core.h: \
-$(srcdir)/z.tcl $(srcdir)/z3950v3.asn $(YAZCOMP)
+$(top_srcdir)/include/yaz/z-core.h: z-core.c
+
+z-core.c: $(srcdir)/z.tcl $(srcdir)/z3950v3.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/z3950v3.asn
# Date extension
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/z3950v3.asn
# Date extension