X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=46e2e50d4f28d3402ad6746333f65aafa4703dd9;hp=b3b62a35020f7e98c4f9c3b1e0829c58f98f54af;hb=99f1879827d5be93a6363b5adbc83b824135dd88;hpb=8cd41e6a09e7279587dc29774669fbc13685566d

diff --git a/src/Makefile.am b/src/Makefile.am
index b3b62a3..46e2e50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2009 Index Data
+## Copyright (C) 1995-2010 Index Data
 
 YAZ_VERSION_INFO=4:0:0
 
@@ -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)
@@ -82,7 +81,7 @@ libyaz_la_SOURCES=version.c options.c log.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 \
@@ -103,12 +102,13 @@ libyaz_la_SOURCES=version.c options.c log.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 iconv_decode_danmarc.c sc.c \
-  json.c
+  json.c xml_include.c file_glob.c dirent.c mutex-p.h mutex.c condvar.c \
+  thread_id.c gettimeofday.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)