Fix problem with order of C include paths.

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1965843..850d52f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.23 2002-09-16 18:45:13 adam Exp $
+## $Id: Makefile.am,v 1.28 2003-02-20 15:05:40 adam Exp $
 
 if ISTHR
 extra=libyazthread.la
@@ -8,7 +8,7 @@ if ISSSL
 ssllib=libyazssl.la
 endif
 
-LDFLAGS=-version-info 1:0:0
+LDFLAGS=-version-info 2:0:0
 
 bin_SCRIPTS = yaz-config
 
@@ -30,9 +30,9 @@ libyazmalloc_la_SOURCES=
 libyazssl_la_LIBADD=tcpip.lo comstack.lo
 libyazssl_la_SOURCES=
 
-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 +74,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 \
+ ../util/libutil.la ../ccl/libccl.la ../cql/libcql.la ../zutil/libzutil.la \
  ../ill/libill.la ../z39.50/libz39.50.la