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
Fixed bug #707: CQL->RPN ignores lines with leading spaces. Changed
[yaz-moved-to-github.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
96abf16
..
c54d47a
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,6
+1,6
@@
## This file is part of the YAZ toolkit.
## Copyright (C) 1994-2006, Index Data, All rights reserved.
## This file is part of the YAZ toolkit.
## Copyright (C) 1994-2006, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.38 2006-05-23 13:43:40 adam Exp $
+## $Id: Makefile.am,v 1.41 2006-10-09 21:12:44 adam Exp $
YAZ_VERSION_INFO=2:1:0
YAZ_VERSION_INFO=2:1:0
@@
-22,8
+22,8
@@
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv
YAZCOMP=$(top_srcdir)/util/yaz-asncomp
csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv
YAZCOMP=$(top_srcdir)/util/yaz-asncomp
-YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I../include
-YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I ../include
+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_CFLAGS=$(THREAD_CFLAGS)
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
AM_CFLAGS=$(THREAD_CFLAGS)
AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
@@
-73,7
+73,7
@@
libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
eventl.h service.c service.h session.h test.c \
xmlquery.c \
mime.c mime.h \
eventl.h service.c service.h session.h test.c \
xmlquery.c \
mime.c mime.h \
- nfa.c \
+ nfa.c nfaxml.c \
record_conv.c retrieval.c
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
record_conv.c retrieval.c
libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
@@
-136,15
+136,21
@@
$(srcdir)/z.tcl $(srcdir)/esadmin.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/esadmin.asn
# Charset negotiation
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/esadmin.asn
# Charset negotiation
-z-charneg.c: $(srcdir)/z.tcl $(srcdir)/charneg-3.asn $(YAZCOMP)
+z-charneg.c \
+$(top_srcdir)/include/yaz/z-charneg.h: \
+$(srcdir)/z.tcl $(srcdir)/charneg-3.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/charneg-3.asn
# UserInfoFormat-multipleSearchTerms-2
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/charneg-3.asn
# UserInfoFormat-multipleSearchTerms-2
-z-mterm2.c: $(srcdir)/z.tcl $(srcdir)/mterm2.asn $(YAZCOMP)
+z-mterm2.c \
+$(top_srcdir)/include/yaz/z-mterm2.h: \
+$(srcdir)/z.tcl $(srcdir)/mterm2.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/mterm2.asn
# UserInfoFormat-multipleSearchTerms-2
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/mterm2.asn
# UserInfoFormat-multipleSearchTerms-2
-z-oclcui.c: $(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
+z-oclcui.c \
+$(top_srcdir)/include/yaz/z-oclcui.h: \
+$(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/oclcui.asn
# ILL protocol
$(TCLSH) $(YAZCOMP_Z) $(srcdir)/oclcui.asn
# ILL protocol