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
Added my new NFA character normalizer. Not yet ready, but want to
[yaz-moved-to-github.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
090f5ff
..
3ccaf39
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,8
+1,8
@@
## This file is part of the YAZ toolkit.
## This file is part of the YAZ toolkit.
-## Copyright (C) 1994-2005, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.29 2006-03-15 13:32:05 adam Exp $
+## Copyright (C) 1994-2006, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.34 2006-05-03 09:04:33 heikki Exp $
-YAZ_VERSION_INFO=2:0:0
+YAZ_VERSION_INFO=2:1:0
lib_LTLIBRARIES = libyaz.la libyazthread.la
# noinst_PROGRAMS = cqlparse
lib_LTLIBRARIES = libyaz.la libyazthread.la
# noinst_PROGRAMS = cqlparse
@@
-29,10
+29,14
@@
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
AM_YFLAGS=-p cql_
AM_YFLAGS=-p cql_
-# MARC8 conversion is generated from codetables.xml
+# MARC8->UTF8 conversion is generated from codetables.xml
$(srcdir)/marc8.c: charconv.tcl codetables.xml
cd $(srcdir); ./charconv.tcl -p marc8 codetables.xml -o marc8.c
$(srcdir)/marc8.c: charconv.tcl codetables.xml
cd $(srcdir); ./charconv.tcl -p marc8 codetables.xml -o marc8.c
+# UTF-8->MARC8 conversion is generated from codetables.xml
+$(srcdir)/marc8r.c: charconv.tcl codetables.xml
+ cd $(srcdir); ./charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
+
# Generate diagnostics from CSVs
$(top_srcdir)/include/yaz/diagbib1.h $(srcdir)/diagbib1.c: csvtobib1.tcl bib1.csv
cd $(srcdir); ./csvtobib1.tcl
# Generate diagnostics from CSVs
$(top_srcdir)/include/yaz/diagbib1.h $(srcdir)/diagbib1.c: csvtobib1.tcl bib1.csv
cd $(srcdir); ./csvtobib1.tcl
@@
-42,7
+46,7
@@
$(top_srcdir)/include/yaz/diagsrw.h $(srcdir)/diagsrw.c: csvtosrw.tcl srw.csv
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 \
- siconv.c marc8.c \
+ siconv.c marc8.c marc8r.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 \
@@
-67,7
+71,9
@@
libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
eventl.h service.c service.h session.h test.c \
xmlquery.c \
eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
eventl.h service.c service.h session.h test.c \
xmlquery.c \
- mime.c mime.h
+ mime.c mime.h \
+ nfa.c \
+ record_conv.c
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
@@
-129,15
+135,15
@@
$(srcdir)/z.tcl $(srcdir)/esadmin.asn $(YAZCOMP)
cd $(srcdir); $(YAZCOMPLINE) esadmin.asn
# Charset negotiation
cd $(srcdir); $(YAZCOMPLINE) esadmin.asn
# Charset negotiation
-$(srcdir)/z-charneg.c: $(srcdir)/z.tcl $(srcdir)/charneg-3.asn
+$(srcdir)/z-charneg.c: $(srcdir)/z.tcl $(srcdir)/charneg-3.asn $(YAZCOMP)
cd $(srcdir); $(YAZCOMPLINE) $(YCFLAGS) charneg-3.asn
# UserInfoFormat-multipleSearchTerms-2
cd $(srcdir); $(YAZCOMPLINE) $(YCFLAGS) charneg-3.asn
# UserInfoFormat-multipleSearchTerms-2
-$(srcdir)/z-mterm2.c: $(srcdir)/z.tcl $(srcdir)/mterm2.asn
+$(srcdir)/z-mterm2.c: $(srcdir)/z.tcl $(srcdir)/mterm2.asn $(YAZCOMP)
cd $(srcdir); $(YAZCOMPLINE) mterm2.asn
# UserInfoFormat-multipleSearchTerms-2
cd $(srcdir); $(YAZCOMPLINE) mterm2.asn
# UserInfoFormat-multipleSearchTerms-2
-$(srcdir)/z-oclcui.c: $(srcdir)/z.tcl $(srcdir)/oclcui.asn
+$(srcdir)/z-oclcui.c: $(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
cd $(srcdir); $(YAZCOMPLINE) oclcui.asn
# ILL protocol
cd $(srcdir); $(YAZCOMPLINE) oclcui.asn
# ILL protocol