-## $Id: Makefile.am,v 1.20 2002-03-18 12:22:00 adam Exp $
+## $Id: Makefile.am,v 1.24 2002-10-22 12:51:18 adam Exp $
if ISTHR
extra=libyazthread.la
XMALLOC_FLAGS = -DTRACE_XMALLOC=2 -I$(top_srcdir)/include
+SSL_FLAGS= -I$(top_srcdir)/include $(SSL_DEFS) $(SSL_CFLAGS)
+
nmem.lo: $(top_srcdir)/util/nmem.c
$(LTCOMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/util/nmem.c
$(COMPILE) $(XMALLOC_FLAGS) -c $(top_srcdir)/util/xmalloc.c
comstack.lo: $(top_srcdir)/comstack/comstack.c
- $(LTCOMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/comstack.c
+ $(LTCOMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/comstack.c
comstack.o: $(top_srcdir)/comstack/comstack.c
- $(COMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/comstack.c
+ $(COMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/comstack.c
tcpip.lo: $(top_srcdir)/comstack/tcpip.c
- $(LTCOMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/tcpip.c
+ $(LTCOMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/tcpip.c
tcpip.o: $(top_srcdir)/comstack/tcpip.c
- $(COMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/tcpip.c
+ $(COMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/tcpip.c
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 ../zutil/libzutil.la \
+ ../ill/libill.la ../z39.50/libz39.50.la