X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=lib%2FMakefile.am;h=ca46b69a1060a1a7c0b8ab743efb9668de93f096;hp=ff85dc5865e2cc24daf398d7a83a53081a5c7b90;hb=95a7ea9b644c520d7d7b7c5d0c71ca44dd58a225;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ff85dc5..ca46b69 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,18 @@
-## $Id: Makefile.am,v 1.9 2000-11-23 10:58:32 adam Exp $
+## $Id: Makefile.am,v 1.24 2002-10-22 12:51:18 adam Exp $
 
 if ISTHR
 extra=libyazthread.la
 endif
 
-lib_LTLIBRARIES = libyaz.la $(extra)
+if ISSSL
+ssllib=libyazssl.la
+endif
+
+LDFLAGS=-version-info 1:0:0
+
+bin_SCRIPTS = yaz-config
+
+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,22 +21,59 @@ EXTRA_libyaz_la_SOURCES=x.c
 # No real sources
 libyaz_la_SOURCES=
 
-libyazthread_la_SOURCES=nmem.c statserv.c
+libyazthread_la_LIBADD=nmem.lo statserv.lo eventl.lo
+libyazthread_la_SOURCES=
 
-LDFLAGS=-version-info 1:0:0
+libyazmalloc_la_LIBADD=xmalloc.lo
+libyazmalloc_la_SOURCES=
 
-nmem.c:
-	ln -s $(srcdir)/../util/nmem.c
+libyazssl_la_LIBADD=tcpip.lo comstack.lo
+libyazssl_la_SOURCES=
 
-statserv.c:
-	ln -s $(srcdir)/../server/statserv.c
+THREADED_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
 
-INCLUDES =-I$(srcdir)/../include -I$(srcdir)/../server  -D_REENTRANT=1 -DHAVE_PTHREAD_H=1
+XMALLOC_FLAGS = -DTRACE_XMALLOC=2 -I$(top_srcdir)/include
 
-bin_SCRIPTS = yaz-config
+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
+
+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 ../$(ASNMODULE)/libasn.la \
+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 ../ccl/libccl.la ../zutil/libzutil.la \
+ ../ill/libill.la ../z39.50/libz39.50.la