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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index be35ba4..ca46b69 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,34 +1,79 @@
-## $Id: Makefile.am,v 1.2 2000-02-28 11:44:39 adam Exp $
+## $Id: Makefile.am,v 1.24 2002-10-22 12:51:18 adam Exp $
 
-lib_LIBRARIES = libyaz.a
+if ISTHR
+extra=libyazthread.la
+endif
+
+if ISSSL
+ssllib=libyazssl.la
+endif
+
+LDFLAGS=-version-info 1:0:0
 
 bin_SCRIPTS = yaz-config
 
-libyaz_a_SOURCES=
-
-LIB=libyaz.a
-
-YAZLIBS=../odr/libodr.a ../@ASNMODULE@/libasn.a ../comstack/libcomstack.a \
- ../server/libserver.a ../zutil/libzutil.a ../util/libutil.a \
- ../ccl/libccl.a ../retrieval/libret.a @ILLLIB@
-
-libyaz.a: $(YAZLIBS)
-	rm -f $(LIB)
-	for i in $(YAZLIBS); do echo $$i; ar x $$i; rm -f __*; done
-	ar qc $(LIB) *.o
-	rm -f *.o
-	$(RANLIB) $(LIB)
-
-#  Public libraries and header files
-LIBDIR=$(exec_prefix)/lib
-INCDIR=$(prefix)/include
-
-yaz-config: Makefile
-	@echo "#!/bin/sh" >yaz-config
-	@echo "# YAZ settings for developers" >>yaz-config
-	@echo "YAZBIN='$(bindir)'" >>yaz-config
-	@echo "YAZTAB='$(pkgdatadir)/tab'" >>yaz-config
-	@echo "YAZLIB='-L$(libdir) -lyaz $(LIBS)'" >>yaz-config
-	@echo "YAZINC='-I$(includedir)'" >>yaz-config
-	chmod +x 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
+
+# No real sources
+libyaz_la_SOURCES=
+
+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
+
+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 \
+ ../util/libutil.la ../ccl/libccl.la ../zutil/libzutil.la \
+ ../ill/libill.la ../z39.50/libz39.50.la