X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=524b192227d6c628cefbe6aa5e98485aa9916920;hp=ea5f2cdd1fc405fa8e7fc3f5a3b017173471b7ee;hb=cf30376bd9e43ad653c6292f275ee4dd10b70a6c;hpb=35cded4faea1982245adfd947d73316453beb7ec

diff --git a/src/Makefile.am b/src/Makefile.am
index ea5f2cd..524b192 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,10 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.60 2007-04-17 08:15:15 adam Exp $
+## $Id: Makefile.am,v 1.71 2007-11-09 16:46:43 adam Exp $
 
 YAZ_VERSION_INFO=3:0:0
 
-lib_LTLIBRARIES = libyaz.la
-# noinst_PROGRAMS = cqlparse
+lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la
 
 dist-hook:
 	test -f $(srcdir)/cql.c || exit 1
@@ -15,7 +14,7 @@ tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
  esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
 
 illdatadir=$(pkgdatadir)/ill
-illdata_DATA=ill9702.asn item-req.asn ill.tcl
+illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
 
 EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
  charconv.tcl codetables.xml \
@@ -28,6 +27,8 @@ 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_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
+libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
+libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
 
 AM_YFLAGS=-p cql_
 
@@ -41,7 +42,7 @@ marc8r.c: charconv.tcl codetables.xml
 
 # Generate OID database from CSV
 oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
-	$(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir)/oid.csv $(srcdir)/oid_std.c $(top_srcdir)/include/yaz/oid_std.h
+	$(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir) $(srcdir)/oid.csv oid_std.c oid_std.h
 
 # Generate diagnostics from CSVs
 diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
@@ -63,7 +64,7 @@ GEN_FILES = oid_std.c \
   zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
   zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c zes-admin.c \
   z-charneg.c \
-  ill-core.c item-req.c 
+  ill-core.c item-req.c oclc-ill-req-ext.c
 
 libyaz_la_SOURCES=version.c options.c log.c \
  $(GEN_FILES) \
@@ -84,18 +85,27 @@ libyaz_la_SOURCES=version.c options.c log.c \
   otherinfo.c pquery.c sortspec.c charneg.c initopt.c \
   zoom-c.c zoom-socket.c zoom-opt.c zoom-p.h \
   grs1disp.c zgdu.c soap.c srw.c srwutil.c \
-  opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \
-  cclqfile.c cclstr.c cclxmlconfig.c \
+  opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c cclp.h \
+  cclqfile.c cclstr.c cclxmlconfig.c ccl_stop_words.c \
   cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
   cqlstrer.c querytowrbuf.c \
-  eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
-  eventl.h service.c service.h session.h test.c timing.c \
+  tcpdchk.c \
+  test.c timing.c \
   xmlquery.c http.c \
-  mime.c mime.h oid_util.c \
-  record_conv.c retrieval.c elementset.c snprintf.c query-charset.c
+  mime.c mime.h oid_util.c tokenizer.c \
+  record_conv.c retrieval.c elementset.c snprintf.c query-charset.c \
+  copy_types.c match_glob.c poll.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
+libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
+  requestq.c eventl.h session.h service.c service.h mutex.c
+
+libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
+
+libyaz_icu_la_SOURCES = icu_I18N.c
+libyaz_icu_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
+
 # Rules for Z39.50 V3
 z-accdes1.c \
 z-accform1.c \
@@ -171,11 +181,15 @@ $(top_srcdir)/include/yaz/ill-core.h: \
 $(srcdir)/ill.tcl $(srcdir)/ill9702.asn $(YAZCOMP)
 	$(TCLSH) $(YAZCOMP_I) $(srcdir)/ill9702.asn
 
+# OCLC ILL Request Extension
+oclc-ill-req-ext.c \
+$(top_srcdir)/include/yaz/oclc-ill-req-ext.h: \
+$(srcdir)/ill.tcl $(srcdir)/oclc-ill-req-ext.asn $(YAZCOMP)
+	$(TCLSH) $(YAZCOMP_I) $(srcdir)/oclc-ill-req-ext.asn
+
 # Item Request
 item-req.c \
 $(top_srcdir)/include/yaz/item-req.h: \
 $(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
 	$(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
 
-# cqlparse_SOURCES = cqlstd.y
-