X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=868f832cd65240c08f8a40192e19513c0bd3d53b;hb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e;hp=b6532614a6416176814903ebb58814208c22231c;hpb=bc0541635987ad8f35af9df6aacd5534d519ccb6;p=yaz-moved-to-github.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b653261..868f832 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,10 @@
-## $Id: Makefile.am,v 1.5 2000-05-02 19:32:16 adam Exp $
+## $Id: Makefile.am,v 1.16 2001-11-13 23:00:42 adam Exp $
 
-lib_LTLIBRARIES = libyaz.la
+if ISTHR
+extra=libyazthread.la
+endif
 
-bin_SCRIPTS = yaz-config
+lib_LTLIBRARIES = libyaz.la $(extra) libyazmalloc.la
 
 # If the line below is omitted the LINK variable is
 # not set in Makefile.in and it will NOT work ..
@@ -11,23 +13,30 @@ EXTRA_libyaz_la_SOURCES=x.c
 # No real sources
 libyaz_la_SOURCES=
 
-LDFLAGS=-version-info 0:0:0
+libyazthread_la_SOURCES=nmem.c statserv.c eventl.c
+
+libyazmalloc_la_SOURCES=xmalloc.c
+
+$(srcdir)/nmem.c: $(top_srcdir)/util/nmem.c
+	cp $(top_srcdir)/util/nmem.c $(srcdir)
+
+$(srcdir)/statserv.c: $(top_srcdir)/server/statserv.c
+	cp $(top_srcdir)/server/statserv.c $(srcdir)
+
+$(srcdir)/eventl.c: $(top_srcdir)/server/eventl.c
+	cp $(top_srcdir)/server/eventl.c $(srcdir)
+
+$(srcdir)/xmalloc.c: $(top_srcdir)/util/xmalloc.c
+	cp $(top_srcdir)/util/xmalloc.c $(srcdir)
+
+LDFLAGS=-version-info 1:0:0
+
+CFLAGS =-DTRACE_XMALLOC=2 -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
+
+bin_SCRIPTS = yaz-config
 
-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)
-
-#  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
+ ../util/libutil.la ../retrieval/libret.la \
+ $(EXTRALIB)