Using AM_CFLAGS instead of CFLAGS. 1.8.3 closer.

[yaz-moved-to-github.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ff85dc5..b54511c 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,10 @@
-## $Id: Makefile.am,v 1.9 2000-11-23 10:58:32 adam Exp $
+## $Id: Makefile.am,v 1.17 2001-11-19 09:16:37 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,22 +13,30 @@ 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
 
-LDFLAGS=-version-info 1:0:0
+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)
 
-nmem.c:
-       ln -s $(srcdir)/../util/nmem.c
+$(srcdir)/eventl.c: $(top_srcdir)/server/eventl.c
+       cp $(top_srcdir)/server/eventl.c $(srcdir)
 
-statserv.c:
-       ln -s $(srcdir)/../server/statserv.c
+$(srcdir)/xmalloc.c: $(top_srcdir)/util/xmalloc.c
+       cp $(top_srcdir)/util/xmalloc.c $(srcdir)
+
+LDFLAGS=-version-info 1:0:0
 
-INCLUDES =-I$(srcdir)/../include -I$(srcdir)/../server  -D_REENTRANT=1 -DHAVE_PTHREAD_H=1
+AM_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)
+ ../util/libutil.la ../retrieval/libret.la \
+ $(EXTRALIB)