projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
226ad61
..
b54511c
100644
(file)
--- a/
lib/Makefile.am
+++ b/
lib/Makefile.am
@@
-1,10
+1,10
@@
-## $Id: Makefile.am,v 1.13 2001-10-03 23:55:18 adam Exp $
+## $Id: Makefile.am,v 1.17 2001-11-19 09:16:37 adam Exp $
if ISTHR
extra=libyazthread.la
endif
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 ..
# 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=
# 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)
$(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)/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
LDFLAGS=-version-info 1:0:0
-INCLUDES =-I$(top_srcdir)/include -I$(top_srcdir)/server -D_REENTRANT=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 \
../comstack/libcomstack.la ../server/libserver.la \
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)
$(EXTRALIB)