Fixed Library add's for libyaz_la, libyaz_icu.la, libyaz_server.la.
[yaz-moved-to-github.git] / src / Makefile.am
index 9135bd3..b9b4db5 100644 (file)
@@ -1,6 +1,5 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.74 2008-03-05 10:41:45 adam Exp $
+## Copyright (C) 1995-2008 Index Data
 
 YAZ_VERSION_INFO=3:0:0
 
@@ -28,8 +27,9 @@ 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_server_la_LIBADD = libyaz.la
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
-libyaz_icu_la_LIBADD = $(ICU_LIBS)
+libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
 
 AM_YFLAGS=-p cql_
 
@@ -92,10 +92,12 @@ 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 match_glob.c poll.c daemon.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
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)