X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=4fe2b9052542ac9db82c7e6be68baa85896354b2;hb=cf273cb8a7f73124935713928cd5df5b537f8b9c;hp=94c371e365df1ad4d69ed97b05df6acdbd09a233;hpb=27e67487d8100738feb98ae7315540846d6bfdf0;p=yaz-moved-to-github.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 94c371e..4fe2b90 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.22 2002-06-02 21:34:45 adam Exp $
+## $Id: Makefile.am,v 1.29 2003-04-17 23:24:00 adam Exp $
 
 if ISTHR
 extra=libyazthread.la
@@ -8,8 +8,6 @@ if ISSSL
 ssllib=libyazssl.la
 endif
 
-LDFLAGS=-version-info 1:0:0
-
 bin_SCRIPTS = yaz-config
 
 lib_LTLIBRARIES = libyaz.la $(extra) $(ssllib) libyazmalloc.la
@@ -18,21 +16,27 @@ lib_LTLIBRARIES = libyaz.la $(extra) $(ssllib) libyazmalloc.la
 # not set in Makefile.in and it will NOT work ..
 EXTRA_libyaz_la_SOURCES=x.c
 
+YAZ_VERSION_INFO=2:0:0
+
 # No real sources
 libyaz_la_SOURCES=
+libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
 libyazthread_la_LIBADD=nmem.lo statserv.lo eventl.lo
 libyazthread_la_SOURCES=
+libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
 libyazmalloc_la_LIBADD=xmalloc.lo
 libyazmalloc_la_SOURCES=
+libyazmalloc_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
 libyazssl_la_LIBADD=tcpip.lo comstack.lo
 libyazssl_la_SOURCES=
+libyazssl_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
-THREADED_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
-
-XMALLOC_FLAGS = -DTRACE_XMALLOC=2 -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/server
+THREADED_FLAGS = @CFLAGSTHREADS@
+XMALLOC_FLAGS = -DTRACE_XMALLOC=2 
 
 SSL_FLAGS= -I$(top_srcdir)/include $(SSL_DEFS) $(SSL_CFLAGS)
 
@@ -74,7 +78,6 @@ tcpip.o: $(top_srcdir)/comstack/tcpip.c
 
 libyaz_la_LIBADD=../odr/libodr.la \
  ../comstack/libcomstack.la ../server/libserver.la \
- ../util/libutil.la ../retrieval/libret.la \
- ../ccl/libccl.la ../zutil/libzutil.la \
- ../zoom/libzoom.la ../ill/libill.la ../z39.50/libz39.50.la
+ ../util/libutil.la ../ccl/libccl.la ../cql/libcql.la ../zutil/libzutil.la \
+ ../ill/libill.la ../z39.50/libz39.50.la