X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=d8dd1e9cb88d84ac46105763ac132f7238a8595d;hp=b27f1fe453977d220d6e0c53a93e77306787dcbe;hb=7dc39ebcca4138d27f9a0e5082b2829a7c96375a;hpb=32e16c37ce5b2d1ed0b3e6edfb48fd5ae1ec24b3

diff --git a/src/Makefile.am b/src/Makefile.am
index b27f1fe..d8dd1e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2008 Index Data
+## Copyright (C) 1995-2010 Index Data
 
-YAZ_VERSION_INFO=3:0:0
+YAZ_VERSION_INFO=4:0:0
 
 lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la
 
@@ -26,8 +26,7 @@ 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_la_LIBADD = $(SSL_LIBS)
-libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
+libyaz_la_LIBADD = $(SSL_LIBS) $(TCPD_LIBS)
 libyaz_server_la_LIBADD = libyaz.la
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
 libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
@@ -36,15 +35,15 @@ AM_YFLAGS=-p cql_
 
 # MARC8->UTF8 conversion is generated from codetables.xml
 marc8.c: charconv.tcl codetables.xml
-	$(TCLSH) $(srcdir)/charconv.tcl -p marc8 $(srcdir)/codetables.xml -o marc8.c
+	$(TCLSH) $(srcdir)/charconv.tcl -p marc8 $(srcdir)/codetables.xml -o $@
 
 # UTF-8->MARC8 conversion is generated from codetables.xml
 marc8r.c: charconv.tcl codetables.xml
-	$(TCLSH) $(srcdir)/charconv.tcl -r -p marc8r $(srcdir)/codetables.xml -o marc8r.c
+	$(TCLSH) $(srcdir)/charconv.tcl -r -p marc8r $(srcdir)/codetables.xml -o $@
 
 # ISO5426->UTF8 conversion is generated from codetables-iso5426.xml
 iso5426.c: charconv.tcl codetables-iso5426.xml
-	$(TCLSH) $(srcdir)/charconv.tcl -p iso5426 $(srcdir)/codetables-iso5426.xml -o iso5426.c
+	$(TCLSH) $(srcdir)/charconv.tcl -p iso5426 $(srcdir)/codetables-iso5426.xml -o $@
 
 # Generate OID database from CSV
 oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
@@ -75,14 +74,14 @@ GEN_FILES = oid_std.c \
 libyaz_la_SOURCES=version.c options.c log.c \
  $(GEN_FILES) \
   marcdisp.c marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
-  wrbuf.c oid_db.c \
+  wrbuf.c oid_db.c errno.c \
   nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
   siconv.c iconv-p.h utf8.c ucs4.c iso5428.c advancegreek.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 \
   ber_oid.c odr_use.c odr_choice.c odr_any.c ber_any.c odr.c odr_mem.c \
-  dumpber.c odr_enum.c odr-priv.h libxml2_error.c \
+  dumpber.c odr_enum.c odr-priv.h \
   comstack.c tcpip.c waislen.c unix.c \
   prt-ext.c \
   ill-get.c \
@@ -90,7 +89,7 @@ libyaz_la_SOURCES=version.c options.c log.c \
   logrpn.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 \
+  grs1disp.c zgdu.c soap.c srw.c srwutil.c uri.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 rpn2cql.c \
@@ -102,16 +101,19 @@ libyaz_la_SOURCES=version.c options.c log.c \
   record_conv.c retrieval.c elementset.c snprintf.c query-charset.c \
   copy_types.c match_glob.c poll.c daemon.c \
   iconv_encode_marc8.c iconv_encode_iso_8859_1.c iconv_encode_wchar.c \
-  iconv_decode_marc8.c iconv_decode_iso5426.c sc.c
+  iconv_decode_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.c \
+  json.c xml_include.c file_glob.c dirent.c mutex-p.h mutex.c condvar.c \
+  thread_id.c gettimeofday.c thread_create.c spipe.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 mutex.c
+  requestq.c eventl.h session.h 
 
 libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-libyaz_icu_la_SOURCES = icu_I18N.c
+libyaz_icu_la_SOURCES = icu_chain.c icu_utf16.c icu_utf8.c \
+	icu_transform.c icu_casemap.c icu_tokenizer.c icu_sortkey.c
 libyaz_icu_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
 # Rules for Z39.50 V3