X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=lib%2FMakefile.am;h=0daab0db56aa682e53d7d7131767f0ad68a69827;hp=6fb0ce2934792efc896d89e091a3d58f1708d505;hb=22f4e21c81ec94ad74eb7a329482cbe4a836cec9;hpb=2b381dfe4c8f63130ce32e1117adf9e6be5cfa3b diff --git a/lib/Makefile.am b/lib/Makefile.am index 6fb0ce2..0daab0d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,14 +1,18 @@ -## $Id: Makefile.am,v 1.19 2002-02-28 13:21:16 adam Exp $ +## $Id: Makefile.am,v 1.20 2002-03-18 12:22:00 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,6 +27,9 @@ 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 @@ -51,6 +58,18 @@ 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_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/comstack.c + +comstack.o: $(top_srcdir)/comstack/comstack.c + $(COMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/comstack.c + +tcpip.lo: $(top_srcdir)/comstack/tcpip.c + $(LTCOMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/tcpip.c + +tcpip.o: $(top_srcdir)/comstack/tcpip.c + $(COMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/tcpip.c + libyaz_la_LIBADD=../odr/libodr.la \ ../comstack/libcomstack.la ../server/libserver.la \ ../util/libutil.la ../retrieval/libret.la \