X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=3ccaf39b87b447a2977ddc85892b181ecb074aa0;hp=08eaa362a293be14028d518775395813e3f0f61e;hb=4d994a119a1949522fe229270983ba1b1b399c6a;hpb=d675fdcc2386440425e3d230730378bc96a2664c

diff --git a/src/Makefile.am b/src/Makefile.am
index 08eaa36..3ccaf39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,11 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1994-2005, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.21 2005-04-22 14:59:42 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 $
 
-if ISTHR
-thrlib=libyazthread.la
-endif
+YAZ_VERSION_INFO=2:1:0
 
-YAZ_VERSION_INFO=2:0:0
-
-lib_LTLIBRARIES = libyaz.la $(thrlib) 
+lib_LTLIBRARIES = libyaz.la libyazthread.la
+# noinst_PROGRAMS = cqlparse
 
 dist-hook:
 	test -f $(srcdir)/cql.c || exit 1
@@ -24,27 +21,32 @@ EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
  charconv.tcl codetables.xml \
  csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv
 
-YAZCOMP = $(top_srcdir)/util/yaz-asncomp
+YAZCOMP = ../util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
+AM_CFLAGS=$(THREAD_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
+
 AM_YFLAGS=-p cql_
-THREADED_FLAGS = @CFLAGSTHREADS@
 
-# MARC8 conversion is generated from codetables.xml
-marc8.c: charconv.tcl 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
 
+# 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 diagbib1.c: csvtobib1.tcl bib1.csv
+$(top_srcdir)/include/yaz/diagbib1.h $(srcdir)/diagbib1.c: csvtobib1.tcl bib1.csv
 	cd $(srcdir); ./csvtobib1.tcl
 
-$(top_srcdir)/include/yaz/diagsrw.h diagsrw.c: csvtosrw.tcl srw.csv
+$(top_srcdir)/include/yaz/diagsrw.h $(srcdir)/diagsrw.c: csvtosrw.tcl srw.csv
 	cd $(srcdir); ./csvtosrw.tcl
 
 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 \
@@ -65,13 +67,20 @@ libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \
   opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \
   cclqfile.c cclstr.c \
   cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
-  cqlstrer.c \
+  cqlstrer.c querytowrbuf.c \
   eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
-  eventl.h service.c service.h session.h
+  eventl.h service.c service.h session.h test.c \
+  xmlquery.c \
+  mime.c mime.h \
+  nfa.c \
+  record_conv.c 
+
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-libyazthread_la_SOURCES=
-libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
+# This library is only built and installed for backwards
+# compatibility (older libs depend on it). The libyaz.la is now threaded
+# by itself..
+libyazthread_la_SOURCES=version.c
 libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
 # Rules for Z39.50 V3
@@ -126,15 +135,15 @@ $(srcdir)/z.tcl $(srcdir)/esadmin.asn $(YAZCOMP)
 	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
-$(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
-$(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
@@ -149,13 +158,5 @@ $(top_srcdir)/include/yaz/item-req.h: \
 $(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
 	cd $(srcdir); $(YAZCOMP) -d ill.tcl -i yaz -I ../include $(YCFLAGS) item-req.asn
 
-# Threaded versions of objects.
-thr-nmem.lo: nmem.c
-	$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/nmem.c -o thr-nmem.lo
-
-thr-statserv.lo: statserv.c
-	$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/statserv.c -o thr-statserv.lo
-thr-eventl.lo: eventl.c
-	$(LTCOMPILE) $(THREADED_FLAGS) -c $(srcdir)/eventl.c -o thr-eventl.lo
-
+# cqlparse_SOURCES = cqlstd.y