-## $Id: Makefile.am,v 1.21 2002-03-22 23:44:55 adam Exp $
+## $Id: Makefile.am,v 1.28 2003-02-20 15:05:40 adam Exp $
if ISTHR
extra=libyazthread.la
ssllib=libyazssl.la
endif
-LDFLAGS=-version-info 1:0:0
+LDFLAGS=-version-info 2:0:0
bin_SCRIPTS = yaz-config
libyazssl_la_LIBADD=tcpip.lo comstack.lo
libyazssl_la_SOURCES=
-THREADED_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
-
-XMALLOC_FLAGS = -DTRACE_XMALLOC=2 -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/server
+THREADED_FLAGS = @CFLAGSTHREADS@
+XMALLOC_FLAGS = -DTRACE_XMALLOC=2
SSL_FLAGS= -I$(top_srcdir)/include $(SSL_DEFS) $(SSL_CFLAGS)
libyaz_la_LIBADD=../odr/libodr.la \
../comstack/libcomstack.la ../server/libserver.la \
- ../util/libutil.la ../retrieval/libret.la \
- $(EXTRALIB)
+ ../util/libutil.la ../ccl/libccl.la ../cql/libcql.la ../zutil/libzutil.la \
+ ../ill/libill.la ../z39.50/libz39.50.la