Fix autotools deprecation warning with s/INCLUDES/AM_CPPFLAGS/g.
This commit is contained in:
Benoit Dejean
@@ -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)
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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`\"" \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_common-2.0.la libgtop_suid_common-2.0.la
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
INCLUDES = @INCLUDES@
|
||||
AM_CPPFLAGS = @AM_CPPFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
||||
|
||||
|
||||
Reference in New Issue
Block a user