INCLUDES -> AM_CPPFLAGS in new autoconf

diff --git a/amd/Makefile.am b/amd/Makefile.am
index ab05c44d146063b52aa4cdfa4eb42c131661a51c..a532017b6daaafe39e6a666dae7d0e25c48bbcc6 100644 (file)
--- a/amd/Makefile.am
+++ b/amd/Makefile.am
@@ -143,7 +143,7 @@ DISTCLEANFILES = build_version.h ops_autofs.c
 dist-hook:
        (cd $(distdir) && rm -f $(BUILT_SOURCES))
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@

diff --git a/amq/Makefile.am b/amq/Makefile.am
index 947d8051054a8ef22ff76ccdb9e2d566cda66bf9..e3bb3682d0652fd158d9a3ffd32a06ca0f21ccfc 100644 (file)
--- a/amq/Makefile.am
+++ b/amq/Makefile.am
@@ -18,7 +18,7 @@ pawd_SOURCES = amq_clnt.c amq_xdr.c pawd.c
 
 LDADD = ../libamu/libamu.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@

diff --git a/fixmount/Makefile.am b/fixmount/Makefile.am
index 69727b9bbdc32da5b162debaed816cc77eecf174..6e8f58048b92413a5eb964c078ea266bdd23c5e5 100644 (file)
--- a/fixmount/Makefile.am
+++ b/fixmount/Makefile.am
@@ -16,7 +16,7 @@ fixmount_SOURCES = fixmount.c
 EXTRA_fixmount_OBJECTS = check_mount.o
 LDADD = $(EXTRA_fixmount_OBJECTS) ../libamu/libamu.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@

diff --git a/fsinfo/Makefile.am b/fsinfo/Makefile.am
index d0b3fec7f73b551ff01c7d4fb0c10a54987fa12d..68ad0e98a7fdbae5f762878388e295057fd37bea 100644 (file)
--- a/fsinfo/Makefile.am
+++ b/fsinfo/Makefile.am
@@ -45,7 +45,7 @@ LDADD = $(EXTRA_fsinfo_OBJECTS) ../libamu/libamu.la
 # must manually add f/lex library to LIBS, and not to LDADD.
 LIBS = @LIBS@ @LEXLIB@
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@

diff --git a/hlfsd/Makefile.am b/hlfsd/Makefile.am
index 338584b38828038bead7c8516e167a433da89bd0..bda0d1679e2aa8d4fbd2d87e5adaff57bcef7e7b 100644 (file)
--- a/hlfsd/Makefile.am
+++ b/hlfsd/Makefile.am
@@ -20,7 +20,7 @@ hlfsd_SOURCES =       \
 
 LDADD = ../libamu/libamu.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@

diff --git a/libamu/Makefile.am b/libamu/Makefile.am
index e75081e1b0752256201e92fab8e0622f31a43d13..a866260adf6a901e396d87233bc1d2bcbdf48e68 100644 (file)
--- a/libamu/Makefile.am
+++ b/libamu/Makefile.am
@@ -69,7 +69,7 @@ libamu_la_DEPENDENCIES = @AMU_LIB_OBJS@
 # LDFLAGS should include standard ones plus LIBTOOL ones
 AM_LDFLAGS = @LDFLAGS@ @LIBTOOL_LDFLAGS@
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@

diff --git a/mk-amd-map/Makefile.am b/mk-amd-map/Makefile.am
index 527b6d5e1db97f5b9541746ec1281e27dd6633ec..e84574fc558056c9406b8abdf33a007f71a7c61f 100644 (file)
--- a/mk-amd-map/Makefile.am
+++ b/mk-amd-map/Makefile.am
@@ -16,7 +16,7 @@ mk_amd_map_SOURCES = mk-amd-map.c
 
 LDADD = ../libamu/libamu.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@

diff --git a/wire-test/Makefile.am b/wire-test/Makefile.am
index 3ce7b77adfd659ff7993e255336282042319d969..9f6ab48302e52cce0f400f42793d63e48eb5bb0d 100644 (file)
--- a/wire-test/Makefile.am
+++ b/wire-test/Makefile.am
@@ -16,7 +16,7 @@ wire_test_SOURCES = wire-test.c
 
 LDADD = ../libamu/libamu.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # allow users to add their own flags via "configure --enable-am-flags=ARG"
 AMU_CFLAGS = @AMU_CFLAGS@