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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 03bbf9b..868f832 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,10 @@
-## $Id: Makefile.am,v 1.12 2001-05-07 12:01:00 adam Exp $
+## $Id: Makefile.am,v 1.16 2001-11-13 23:00:42 adam Exp $
 
 if ISTHR
 extra=libyazthread.la
 endif
 
-lib_LTLIBRARIES = libyaz.la $(extra)
+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 ..
@@ -13,7 +13,9 @@ EXTRA_libyaz_la_SOURCES=x.c
 # No real sources
 libyaz_la_SOURCES=
 
-libyazthread_la_SOURCES=nmem.c statserv.c
+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)
@@ -21,14 +23,20 @@ $(srcdir)/nmem.c: $(top_srcdir)/util/nmem.c
 $(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
 
-INCLUDES =-I$(top_srcdir)/include -I$(top_srcdir)/server  -D_REENTRANT=1 -DHAVE_PTHREAD_H=1
+CFLAGS =-DTRACE_XMALLOC=2 -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
 
 bin_SCRIPTS = yaz-config
 
 libyaz_la_LIBADD=../odr/libodr.la \
  ../comstack/libcomstack.la ../server/libserver.la \
- ../zutil/libzutil.la ../util/libutil.la ../retrieval/libret.la \
+ ../util/libutil.la ../retrieval/libret.la \
  $(EXTRALIB)