Using AM_CPPFLAGS instead of INCLUDES

diff --git a/asn/Makefile.am b/asn/Makefile.am
index 363054a..ad0f888 100644 (file)
--- a/asn/Makefile.am
+++ b/asn/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2001-03-21 15:02:39 adam Exp $
+## $Id: Makefile.am,v 1.6 2002-04-15 09:44:41 adam Exp $
 
 noinst_LTLIBRARIES=libasn.la
 
@@ -11,4 +11,4 @@ pkginclude_HEADERS = \
        prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h prt-exd.h \
        prt-exp.h prt-ext.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include

diff --git a/ccl/Makefile.am b/ccl/Makefile.am
index af757c7..af94680 100644 (file)
--- a/ccl/Makefile.am
+++ b/ccl/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2001-04-05 13:08:48 adam Exp $
+## $Id: Makefile.am,v 1.8 2002-04-15 09:44:41 adam Exp $
 
 noinst_LTLIBRARIES = libccl.la
 
@@ -6,7 +6,7 @@ noinst_PROGRAMS = cclsh
 
 EXTRA_DIST = bib1
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 libccl_la_SOURCES = cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \
   cclqfile.c cclstr.c

diff --git a/client/Makefile.am b/client/Makefile.am
index 63d966d..d26dc49 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1995-2000, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.15 2002-03-18 21:33:48 adam Exp $
+## $Id: Makefile.am,v 1.16 2002-04-15 09:44:41 adam Exp $
 
 if ISSSL
 extra=yaz-client-ssl
@@ -16,4 +16,4 @@ yaz_client_ssl_SOURCES=$(yaz_client_SOURCES)
 yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS)
 yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include

diff --git a/comstack/Makefile.am b/comstack/Makefile.am
index 1d5f540..2594dd8 100644 (file)
--- a/comstack/Makefile.am
+++ b/comstack/Makefile.am
@@ -1,8 +1,8 @@
-## $Id: Makefile.am,v 1.4 2001-03-21 15:02:39 adam Exp $
+## $Id: Makefile.am,v 1.5 2002-04-15 09:44:42 adam Exp $
 
 noinst_LTLIBRARIES=libcomstack.la
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 LIBS =
 

diff --git a/ill/Makefile.am b/ill/Makefile.am
index d1d2be8..89f3ecf 100644 (file)
--- a/ill/Makefile.am
+++ b/ill/Makefile.am
@@ -1,6 +1,6 @@
-## $Id: Makefile.am,v 1.7 2001-04-05 13:08:48 adam Exp $
+## $Id: Makefile.am,v 1.8 2002-04-15 09:44:44 adam Exp $
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 tabdatadir=$(pkgdatadir)/ill
 tabdata_DATA=ill9702.asn item-req.asn ill.tcl

diff --git a/odr/Makefile.am b/odr/Makefile.am
index b0ee1a7..81ab9aa 100644 (file)
--- a/odr/Makefile.am
+++ b/odr/Makefile.am
@@ -1,8 +1,8 @@
-## $Id: Makefile.am,v 1.4 2001-03-21 15:02:39 adam Exp $
+## $Id: Makefile.am,v 1.5 2002-04-15 09:44:44 adam Exp $
 
 noinst_LTLIBRARIES = libodr.la
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 LIBS =
 

diff --git a/retrieval/Makefile.am b/retrieval/Makefile.am
index af04b3e..c95ff59 100644 (file)
--- a/retrieval/Makefile.am
+++ b/retrieval/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2001-03-21 15:02:39 adam Exp $
+## $Id: Makefile.am,v 1.5 2002-04-15 09:44:44 adam Exp $
 
 noinst_LTLIBRARIES=libret.la
 
@@ -8,5 +8,5 @@ libret_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c d1_absyn.c \
   d1_grs.c d1_sutrs.c d1_varset.c d1_espec.c d1_doespec.c d1_map.c d1_marc.c \
   d1_write.c d1_expout.c d1_sumout.c d1_soif.c d1_prtree.c d1_if.c
 
-INCLUDES=-I$(top_srcdir)/include 
+AM_CPPFLAGS=-I$(top_srcdir)/include 
 

diff --git a/server/Makefile.am b/server/Makefile.am
index 892fa95..04a013d 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2001-04-05 13:34:36 adam Exp $
+## $Id: Makefile.am,v 1.6 2002-04-15 09:44:44 adam Exp $
 
 noinst_LTLIBRARIES=libserver.la
 
@@ -9,4 +9,4 @@ EXTRA_DIST=service.c
 
 LIBS =
 
-INCLUDES=-I$(top_srcdir)/include 
+AM_CPPFLAGS=-I$(top_srcdir)/include 

diff --git a/util/Makefile.am b/util/Makefile.am
index 4f6ad78..5d90821 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1994-2001, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.10 2001-05-16 07:37:39 adam Exp $
+## $Id: Makefile.am,v 1.11 2002-04-15 09:44:44 adam Exp $
 
 noinst_LTLIBRARIES = libutil.la
 
@@ -12,9 +12,7 @@ EXTRA_DIST = yaz-comp cvs-date.tcl
 
 LIBS =
 
-INCLUDES =-I$(top_srcdir)/include
-
-libyazthread_la_INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 noinst_PROGRAMS = marcdump
 

diff --git a/z39.50/Makefile.am b/z39.50/Makefile.am
index 30ae263..541c537 100644 (file)
--- a/z39.50/Makefile.am
+++ b/z39.50/Makefile.am
@@ -1,6 +1,6 @@
-## $Id: Makefile.am,v 1.9 2002-02-12 21:11:49 adam Exp $
+## $Id: Makefile.am,v 1.10 2002-04-15 09:44:44 adam Exp $
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 noinst_LTLIBRARIES = libz39.50.la
 

diff --git a/zoom/Makefile.am b/zoom/Makefile.am
index da24039..de0babf 100644 (file)
--- a/zoom/Makefile.am
+++ b/zoom/Makefile.am
@@ -1,7 +1,7 @@
-## $Id: Makefile.am,v 1.2 2001-12-30 22:21:11 adam Exp $
+## $Id: Makefile.am,v 1.3 2002-04-15 09:44:44 adam Exp $
 ## Copyright (C) 2001, Index Data
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 noinst_LTLIBRARIES = libzoom.la
 libzoom_la_SOURCES = zoom-opt.c zoom-c.c zoom-p.h
 

diff --git a/ztest/Makefile.am b/ztest/Makefile.am
index e544371..1f17acb 100644 (file)
--- a/ztest/Makefile.am
+++ b/ztest/Makefile.am
@@ -1,5 +1,4 @@
-## $Id: Makefile.am,v 1.10 2002-03-18 21:33:48 adam Exp $
-
+## $Id: Makefile.am,v 1.11 2002-04-15 09:44:44 adam Exp $
 
 if ISSSL
 sslbin=yaz-ztest-ssl
@@ -24,4 +23,4 @@ yaz_ztest_ssl_LDADD=$(extra) ../lib/libyazssl.la ../lib/libyaz.la \
 
 AM_CFLAGS=@CFLAGSTHREADS@
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include

diff --git a/zutil/Makefile.am b/zutil/Makefile.am
index f612628..2614004 100644 (file)
--- a/zutil/Makefile.am
+++ b/zutil/Makefile.am
@@ -1,7 +1,7 @@
-## $Id: Makefile.am,v 1.8 2001-10-23 21:00:20 adam Exp $
+## $Id: Makefile.am,v 1.9 2002-04-15 09:44:44 adam Exp $
 noinst_LTLIBRARIES = libzutil.la
 
-INCLUDES=-I$(top_srcdir)/include 
+AM_CPPFLAGS=-I$(top_srcdir)/include 
 
 LIBS =