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
Towards 2.0.22
[yaz-moved-to-github.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
9f3052d
..
1ef99f4
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,18
+1,14
@@
-## Copyright (C) 1994-2003, Index Data
+## Copyright (C) 1994-2004, Index Data
## All rights reserved.
## All rights reserved.
-## $Id: Makefile.am,v 1.7 2004-03-10 16:34:29 adam Exp $
+## $Id: Makefile.am,v 1.13 2004-05-01 23:32:20 adam Exp $
if ISTHR
thrlib=libyazthread.la
endif
if ISTHR
thrlib=libyazthread.la
endif
-if ISSSL
-ssllib=libyazssl.la
-endif
-
YAZ_VERSION_INFO=2:0:0
YAZ_VERSION_INFO=2:0:0
-lib_LTLIBRARIES = libyaz.la $(thrlib) $(ssllib)
+lib_LTLIBRARIES = libyaz.la $(thrlib)
TESTS = $(check_PROGRAMS)
TESTS = $(check_PROGRAMS)
@@
-24,18
+20,18
@@
illdatadir=$(pkgdatadir)/ill
illdata_DATA=ill9702.asn item-req.asn ill.tcl
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
illdata_DATA=ill9702.asn item-req.asn ill.tcl
EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
- charconv.tcl charconv.sgm charconv_cjk.xml
+ charconv.tcl codetables.xml charconv.sgm
YAZCOMP = $(top_srcdir)/util/yaz-asncomp
YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
YAZCOMP = $(top_srcdir)/util/yaz-asncomp
YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
AM_YFLAGS=-p cql_
THREADED_FLAGS = @CFLAGSTHREADS@
AM_YFLAGS=-p cql_
THREADED_FLAGS = @CFLAGSTHREADS@
-# MARC8 conversion is generated from charconv.sgm
-marc8.c: charconv.sgm charconv.tcl
- cd $(srcdir); ./charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+# MARC8 conversion is generated from charconv.sgm + codetables.xml
+marc8.c: charconv.tcl charconv.sgm codetables.xml
+ cd $(srcdir); ./charconv.tcl -O 1 -p marc8 charconv.sgm codetables.xml -o marc8.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 \
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 \
@@
-69,10
+65,6
@@
libyazthread_la_SOURCES=
libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-libyazssl_la_SOURCES=
-libyazssl_la_LIBADD=ssl-comstack.lo ssl-tcpip.lo
-libyazssl_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
-
# Rules for Z39.50 V3
$(srcdir)/z-accdes1.c \
$(srcdir)/z-accform1.c \
# Rules for Z39.50 V3
$(srcdir)/z-accdes1.c \
$(srcdir)/z-accform1.c \
@@
-157,11
+149,4
@@
thr-statserv.lo: statserv.c
thr-eventl.lo: eventl.c
$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/eventl.c -o thr-eventl.lo
thr-eventl.lo: eventl.c
$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/eventl.c -o thr-eventl.lo
-# SSL versions of objects.
-ssl-comstack.lo: comstack.c
- $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/comstack.c -o ssl-comstack.lo
-
-ssl-tcpip.lo: tcpip.c
- $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/tcpip.c -o ssl-tcpip.lo
-