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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a2eb3cd..94c371e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,18 @@
-## $Id: Makefile.am,v 1.6 2000-06-19 09:49:35 adam Exp $
+## $Id: Makefile.am,v 1.22 2002-06-02 21:34:45 adam Exp $
 
-lib_LTLIBRARIES = libyaz.la
+if ISTHR
+extra=libyazthread.la
+endif
+
+if ISSSL
+ssllib=libyazssl.la
+endif
+
+LDFLAGS=-version-info 1:0:0
 
 bin_SCRIPTS = yaz-config
 
-EXTRA_DIST = yaz-config.in
+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 ..
@@ -13,9 +21,60 @@ EXTRA_libyaz_la_SOURCES=x.c
 # No real sources
 libyaz_la_SOURCES=
 
-LDFLAGS=-version-info 0:0:0
+libyazthread_la_LIBADD=nmem.lo statserv.lo eventl.lo
+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
+
+nmem.o: $(top_srcdir)/util/nmem.c
+	$(COMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/util/nmem.c
+
+statserv.lo: $(top_srcdir)/server/statserv.c
+	$(LTCOMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/statserv.c
 
-libyaz_la_LIBADD=../odr/libodr.la ../$(ASNMODULE)/libasn.la \
+statserv.o: $(top_srcdir)/server/statserv.c
+	$(COMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/statserv.c
+
+eventl.lo: $(top_srcdir)/server/eventl.c
+	$(LTCOMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/eventl.c
+
+eventl.o: $(top_srcdir)/server/eventl.c
+	$(COMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/server/eventl.c
+
+xmalloc.lo: $(top_srcdir)/util/xmalloc.c
+	$(LTCOMPILE) $(XMALLOC_FLAGS) -c $(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 \
- ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la \
- ../retrieval/libret.la $(ILLLIB)
+ ../util/libutil.la ../retrieval/libret.la \
+ ../ccl/libccl.la ../zutil/libzutil.la \
+ ../zoom/libzoom.la ../ill/libill.la ../z39.50/libz39.50.la
+