X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=b1dd0909c3300c20ad1f585f522fbf6f5e3352b8;hb=e858b0c178feedf5ef60bf6e66956ef5c4fd0b83;hp=c4fa09dd1b94386c49409dd295238570033962e0;hpb=0ffb25b0bf78f53399267664b71206c88980c4da;p=yaz-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index c4fa09d..b1dd090 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.69 2007-10-22 12:21:39 adam Exp $
+## $Id: Makefile.am,v 1.74 2008-03-05 10:41:45 adam Exp $
 
 YAZ_VERSION_INFO=3:0:0
 
@@ -29,6 +29,7 @@ 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)
+libyaz_icu_la_LIBADD = $(ICU_LIBS)
 
 AM_YFLAGS=-p cql_
 
@@ -71,7 +72,7 @@ libyaz_la_SOURCES=version.c options.c log.c \
   marcdisp.c marc_read_xml.c marc_read_iso2709.c marc_read_line.c \
   wrbuf.c oid_db.c \
   nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \
-  siconv.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 \
@@ -91,10 +92,10 @@ libyaz_la_SOURCES=version.c options.c log.c \
   cqlstrer.c querytowrbuf.c \
   tcpdchk.c \
   test.c timing.c \
-  xmlquery.c http.c \
+  xmlquery.c xmlerror.c http.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
+  copy_types.c match_glob.c poll.c daemon.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
@@ -110,7 +111,6 @@ libyaz_icu_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 z-accdes1.c \
 z-accform1.c \
 z-acckrb1.c \
-z-core.c \
 z-diag1.c \
 z-espec1.c \
 z-estask.c \
@@ -130,8 +130,9 @@ zes-psched.c \
 zes-pset.c \
 zes-update0.c \
 $(top_srcdir)/include/yaz/z-accdes1.h \
-$(top_srcdir)/include/yaz/z-core.h: \
-$(srcdir)/z.tcl $(srcdir)/z3950v3.asn $(YAZCOMP)
+$(top_srcdir)/include/yaz/z-core.h: z-core.c
+
+z-core.c: $(srcdir)/z.tcl $(srcdir)/z3950v3.asn $(YAZCOMP)
 	$(TCLSH) $(YAZCOMP_Z) $(srcdir)/z3950v3.asn
 
 # Date extension