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
New tool for ODR testing.
[yaz-moved-to-github.git]
/
lib
/
Makefile.am
diff --git
a/lib/Makefile.am
b/lib/Makefile.am
index
0daab0d
..
850d52f
100644
(file)
--- a/
lib/Makefile.am
+++ b/
lib/Makefile.am
@@
-1,4
+1,4
@@
-## $Id: Makefile.am,v 1.20 2002-03-18 12:22:00 adam Exp $
+## $Id: Makefile.am,v 1.28 2003-02-20 15:05:40 adam Exp $
if ISTHR
extra=libyazthread.la
if ISTHR
extra=libyazthread.la
@@
-8,7
+8,7
@@
if ISSSL
ssllib=libyazssl.la
endif
ssllib=libyazssl.la
endif
-LDFLAGS=-version-info 1:0:0
+LDFLAGS=-version-info 2:0:0
bin_SCRIPTS = yaz-config
bin_SCRIPTS = yaz-config
@@
-30,9
+30,11
@@
libyazmalloc_la_SOURCES=
libyazssl_la_LIBADD=tcpip.lo comstack.lo
libyazssl_la_SOURCES=
libyazssl_la_LIBADD=tcpip.lo comstack.lo
libyazssl_la_SOURCES=
-THREADED_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
+AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/server
+THREADED_FLAGS = @CFLAGSTHREADS@
+XMALLOC_FLAGS = -DTRACE_XMALLOC=2
-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.lo: $(top_srcdir)/util/nmem.c
$(LTCOMPILE) $(THREADED_FLAGS) -c $(top_srcdir)/util/nmem.c
@@
-59,19
+61,19
@@
xmalloc.o: $(top_srcdir)/util/xmalloc.c
$(COMPILE) $(XMALLOC_FLAGS) -c $(top_srcdir)/util/xmalloc.c
comstack.lo: $(top_srcdir)/comstack/comstack.c
$(COMPILE) $(XMALLOC_FLAGS) -c $(top_srcdir)/util/xmalloc.c
comstack.lo: $(top_srcdir)/comstack/comstack.c
- $(LTCOMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/comstack.c
+ $(LTCOMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/comstack.c
comstack.o: $(top_srcdir)/comstack/comstack.c
comstack.o: $(top_srcdir)/comstack/comstack.c
- $(COMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/comstack.c
+ $(COMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/comstack.c
tcpip.lo: $(top_srcdir)/comstack/tcpip.c
tcpip.lo: $(top_srcdir)/comstack/tcpip.c
- $(LTCOMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(top_srcdir)/comstack/tcpip.c
+ $(LTCOMPILE) $(SSL_FLAGS) -c $(top_srcdir)/comstack/tcpip.c
tcpip.o: $(top_srcdir)/comstack/tcpip.c
tcpip.o: $(top_srcdir)/comstack/tcpip.c
- $(COMPILE) $(SSL_DEFS) $(SSL_CFLAGS) -c $(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 \
libyaz_la_LIBADD=../odr/libodr.la \
../comstack/libcomstack.la ../server/libserver.la \
- ../util/libutil.la ../retrieval/libret.la \
- $(EXTRALIB)
+ ../util/libutil.la ../ccl/libccl.la ../cql/libcql.la ../zutil/libzutil.la \
+ ../ill/libill.la ../z39.50/libz39.50.la