X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=8fd9e3b1796206a8593f5d939489da808521fd85;hb=967300e7c27a84954ac8568927adf5d9ef42a300;hp=0daab0db56aa682e53d7d7131767f0ad68a69827;hpb=22f4e21c81ec94ad74eb7a329482cbe4a836cec9;p=yaz-moved-to-github.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0daab0d..8fd9e3b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,10 @@
-## $Id: Makefile.am,v 1.20 2002-03-18 12:22:00 adam Exp $
+## $Id: Makefile.am,v 1.25 2003-01-06 08:20:27 adam Exp $
+
+if SRW
+libsrw=../srw/libsrw.la
+else
+libsrw=
+endif
 
 if ISTHR
 extra=libyazthread.la
@@ -34,6 +40,8 @@ THREADED_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
 
 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
 
@@ -59,19 +67,19 @@ xmalloc.o: $(top_srcdir)/util/xmalloc.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 ../cql/libcql.la ../zutil/libzutil.la \
+ ../ill/libill.la ../z39.50/libz39.50.la $(libsrw)