From: Christos Zoulas Date: Wed, 15 May 2013 00:09:00 +0000 (-0400) Subject: INCLUDES -> AM_CPPFLAGS in new autoconf X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=22190cd59598b730771d67a33d092f4c5a341289;p=am-utils-6.2.git INCLUDES -> AM_CPPFLAGS in new autoconf --- diff --git a/amd/Makefile.am b/amd/Makefile.am index ab05c44d..a532017b 100644 --- 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 947d8051..e3bb3682 100644 --- 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 69727b9b..6e8f5804 100644 --- 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 d0b3fec7..68ad0e98 100644 --- 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 338584b3..bda0d167 100644 --- 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 e75081e1..a866260a 100644 --- 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 527b6d5e..e84574fc 100644 --- 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 3ce7b77a..9f6ab483 100644 --- 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@