X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=4fe2b9052542ac9db82c7e6be68baa85896354b2;hb=c80275992d29b4815dd25d9203e094ae2880f1ae;hp=8e6c18d3b4f3fd7901317691bc66caffde9abf19;hpb=772d9a39dd0e3e139ab975d7d45d1262f5471164;p=yaz-moved-to-github.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8e6c18d..4fe2b90 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,34 +1,83 @@
-## $Id: Makefile.am,v 1.10 2001-04-05 13:08:48 adam Exp $
+## $Id: Makefile.am,v 1.29 2003-04-17 23:24:00 adam Exp $
 
 if ISTHR
 extra=libyazthread.la
 endif
 
-lib_LTLIBRARIES = libyaz.la $(extra)
+if ISSSL
+ssllib=libyazssl.la
+endif
+
+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 ..
 EXTRA_libyaz_la_SOURCES=x.c
 
+YAZ_VERSION_INFO=2:0:0
+
 # No real sources
 libyaz_la_SOURCES=
+libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-libyazthread_la_SOURCES=nmem.c statserv.c
+libyazthread_la_LIBADD=nmem.lo statserv.lo eventl.lo
+libyazthread_la_SOURCES=
+libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-LDFLAGS=-version-info 1:0:0
+libyazmalloc_la_LIBADD=xmalloc.lo
+libyazmalloc_la_SOURCES=
+libyazmalloc_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-nmem.c:
-	ln -s $(srcdir)/../util/nmem.c
+libyazssl_la_LIBADD=tcpip.lo comstack.lo
+libyazssl_la_SOURCES=
+libyazssl_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-statserv.c:
-	ln -s $(srcdir)/../server/statserv.c
+AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/server
+THREADED_FLAGS = @CFLAGSTHREADS@
+XMALLOC_FLAGS = -DTRACE_XMALLOC=2 
 
-INCLUDES =-I$(srcdir)/../include -I$(srcdir)/../server  -D_REENTRANT=1 -DHAVE_PTHREAD_H=1
+SSL_FLAGS= -I$(top_srcdir)/include $(SSL_DEFS) $(SSL_CFLAGS)
 
-bin_SCRIPTS = yaz-config
+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 \
  ../comstack/libcomstack.la ../server/libserver.la \
- ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.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