X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=lib%2FMakefile.am;h=94c371e365df1ad4d69ed97b05df6acdbd09a233;hp=5fe0a9cf3edbefa41778dcb349eea66cde593e07;hb=e0dc2b9e3d7bd7c91c6c6bb2fa650873a7ebfe72;hpb=598c8178dc444f596d5bd6111b4fed52745cad5e

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5fe0a9c..94c371e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,14 +1,18 @@
-## $Id: Makefile.am,v 1.18 2001-11-19 20:43:39 adam Exp $
+## $Id: Makefile.am,v 1.22 2002-06-02 21:34:45 adam Exp $
 
 if ISTHR
 extra=libyazthread.la
 endif
 
+if ISSSL
+ssllib=libyazssl.la
+endif
+
 LDFLAGS=-version-info 1:0:0
 
 bin_SCRIPTS = yaz-config
 
-lib_LTLIBRARIES = libyaz.la $(extra) libyazmalloc.la
+lib_LTLIBRARIES = libyaz.la $(extra) $(ssllib) libyazmalloc.la
 
 # If the line below is omitted the LINK variable is
 # not set in Makefile.in and it will NOT work ..
@@ -23,10 +27,15 @@ libyazthread_la_SOURCES=
 libyazmalloc_la_LIBADD=xmalloc.lo
 libyazmalloc_la_SOURCES=
 
+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
 
+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
 
@@ -51,9 +60,21 @@ xmalloc.lo: $(top_srcdir)/util/xmalloc.c
 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_FLAGS) -c $(top_srcdir)/comstack/comstack.c
+
+comstack.o: $(top_srcdir)/comstack/comstack.c
+	$(COMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/comstack.c
+
+tcpip.lo: $(top_srcdir)/comstack/tcpip.c
+	$(LTCOMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/tcpip.c
+
+tcpip.o: $(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)
+ ../ccl/libccl.la ../zutil/libzutil.la \
+ ../zoom/libzoom.la ../ill/libill.la ../z39.50/libz39.50.la