X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=090f5ffecd6e66dab04b814a626b7e42126aa4ed;hp=fd261a211457fcac25a00f5e6ecc61422c6f2b39;hb=a6af2d19dddb0c2ef961d087d8ca0f2b3bda8f7a;hpb=84d7b06c13daa609e93f353e655c4b02f936d65c

diff --git a/src/Makefile.am b/src/Makefile.am
index fd261a2..090f5ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,14 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2005, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.20 2005-04-22 08:27:57 adam Exp $
-
-if ISTHR
-thrlib=libyazthread.la
-endif
+## $Id: Makefile.am,v 1.29 2006-03-15 13:32:05 adam Exp $
 
 YAZ_VERSION_INFO=2:0:0
 
-lib_LTLIBRARIES = libyaz.la $(thrlib) 
+lib_LTLIBRARIES = libyaz.la libyazthread.la
+# noinst_PROGRAMS = cqlparse
 
 dist-hook:
-	test -f cql.c || exit 1
+	test -f $(srcdir)/cql.c || exit 1
 
 tabdatadir = $(pkgdatadir)/z39.50
 tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
@@ -24,22 +21,23 @@ 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
+$(srcdir)/marc8.c: charconv.tcl codetables.xml
 	cd $(srcdir); ./charconv.tcl -p marc8 codetables.xml -o marc8.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 \
@@ -65,13 +63,18 @@ 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
+
 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
@@ -149,13 +152,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