GNOME.org
 

[libgtop] Fix autotools deprecation warning with s/INCLUDES/AM_CPPFLAGS/g.

commit 119049b8c07c05b2c6e12f36a934b5229cc7f179
Author: Benoit Dejean <bdejean gmail com>
Date:   Sun Jun 21 18:04:12 2015 +0200

    Fix autotools deprecation warning with s/INCLUDES/AM_CPPFLAGS/g.

 configure.ac                  |    4 ++--
 doc/reference/Makefile.am     |    4 ++--
 lib/Makefile.am               |    6 +++---
 src/daemon/Makefile.am        |    2 +-
 sysdeps/aix/Makefile.am       |    2 +-
 sysdeps/bsd/Makefile.am       |    2 +-
 sysdeps/common/Makefile.am    |    2 +-
 sysdeps/cygwin/Makefile.am    |    2 +-
 sysdeps/darwin/Makefile.am    |    2 +-
 sysdeps/freebsd/Makefile.am   |    2 +-
 sysdeps/linux/Makefile.am     |    2 +-
 sysdeps/openbsd/Makefile.am   |    2 +-
 sysdeps/osf1/Makefile.am      |    2 +-
 sysdeps/solaris/Makefile.am   |    2 +-
 sysdeps/stub/Makefile.am      |    2 +-
 sysdeps/stub_suid/Makefile.am |    2 +-
 sysdeps/sun4/Makefile.am      |    2 +-
 17 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6d2370f..2e78e67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,7 +323,7 @@ if test "$GCC" = "yes" ; then
        $CFLAGS"
 fi
 
-INCLUDES="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include 
$GLIB_CFLAGS $X_CFLAGS"
+AM_CPPFLAGS="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir 
-I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
 
 # Add various defines to the config.h file ...
 AH_VERBATIM([_GNU_SOURCE],
@@ -342,7 +342,7 @@ AC_DEFINE([LIBGTOP_VERSION_CODE], [libgtop_version_code],
 AC_DEFINE_UNQUOTED([LIBGTOP_SERVER], ["$LIBGTOP_SERVER"],
                    [The path to the libgtop server])
 
-AC_SUBST(INCLUDES)
+AC_SUBST(AM_CPPFLAGS)
 
 AC_SUBST(LIBGTOP_EXTRA_LIBS)
 AC_SUBST(GLIB_LIBS)
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 9145188..042eb23 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -46,9 +46,9 @@ HTML_IMAGES=
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=
+AM_CPPFLAGS=
 GTKDOC_LIBS=
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 75ab02f..ed8bc0f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 lib_LTLIBRARIES                        = libgtop-2.0.la
 
@@ -39,8 +39,8 @@ introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h \
                        ../include/glibtop/netlist.h ../include/glibtop/procopenfiles.h 
../include/glibtop/open.h
 
 GTop-2.0.gir: libgtop-2.0.la
-GTop_2_0_gir_INCLUDES = GObject-2.0
-GTop_2_0_gir_CFLAGS = $(INCLUDES)
+GTop_2_0_gir_AM_CPPFLAGS = GObject-2.0
+GTop_2_0_gir_CFLAGS = $(AM_CPPFLAGS)
 GTop_2_0_gir_LIBS = libgtop-2.0.la
 GTop_2_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += GTop-2.0.gir
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 685a38c..f29d0a6 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -12,7 +12,7 @@
 ## Martin <martin home-of-linux org>
 ##
 
-INCLUDES                       = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \
+AM_CPPFLAGS                    = $(LIBGTOP_CFLAGS) @AM_CPPFLAGS@ -D_BSD \
                                  -DLIBGTOP_COMPILE_SYSTEM="\"`uname -s`\"" \
                                  -DLIBGTOP_COMPILE_RELEASE="\"`uname -r`\"" \
                                  -DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" \
diff --git a/sysdeps/aix/Makefile.am b/sysdeps/aix/Makefile.am
index a135bda..2ab3801 100644
--- a/sysdeps/aix/Makefile.am
+++ b/sysdeps/aix/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/bsd/Makefile.am b/sysdeps/bsd/Makefile.am
index d4383d6..a669237 100644
--- a/sysdeps/bsd/Makefile.am
+++ b/sysdeps/bsd/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am
index 2dc04c6..373b389 100644
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_common-2.0.la libgtop_suid_common-2.0.la
 
diff --git a/sysdeps/cygwin/Makefile.am b/sysdeps/cygwin/Makefile.am
index ec232f6..e3c9f78 100644
--- a/sysdeps/cygwin/Makefile.am
+++ b/sysdeps/cygwin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la
 
diff --git a/sysdeps/darwin/Makefile.am b/sysdeps/darwin/Makefile.am
index 40776d5..046658a 100644
--- a/sysdeps/darwin/Makefile.am
+++ b/sysdeps/darwin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES                       = @INCLUDES@ @LIBGTOP_INCS@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@ @LIBGTOP_INCS@
 
 noinst_LTLIBRARIES                     = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/freebsd/Makefile.am b/sysdeps/freebsd/Makefile.am
index a175853..c56d6c9 100644
--- a/sysdeps/freebsd/Makefile.am
+++ b/sysdeps/freebsd/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am
index 7307ba5..ae480f1 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la
 
diff --git a/sysdeps/openbsd/Makefile.am b/sysdeps/openbsd/Makefile.am
index 25ba60f..8f62eae 100644
--- a/sysdeps/openbsd/Makefile.am
+++ b/sysdeps/openbsd/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am
index ddae0c1..9b87cc8 100644
--- a/sysdeps/osf1/Makefile.am
+++ b/sysdeps/osf1/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/solaris/Makefile.am b/sysdeps/solaris/Makefile.am
index 3f43e69..8ca9df0 100644
--- a/sysdeps/solaris/Makefile.am
+++ b/sysdeps/solaris/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am
index b5a81f5..f4219ed 100644
--- a/sysdeps/stub/Makefile.am
+++ b/sysdeps/stub/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la
 
diff --git a/sysdeps/stub_suid/Makefile.am b/sysdeps/stub_suid/Makefile.am
index e0bb162..fcc7daf 100644
--- a/sysdeps/stub_suid/Makefile.am
+++ b/sysdeps/stub_suid/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am
index d1aa20e..ec8fc43 100644
--- a/sysdeps/sun4/Makefile.am
+++ b/sysdeps/sun4/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES                       = @INCLUDES@
+AM_CPPFLAGS                    = @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES             = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]