From 10d3293d3fe088c923fbf1e56eeff5b159a4a796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= Date: Mon, 17 Jun 2013 10:59:28 +0200 Subject: [PATCH] build: fix automake warning about preprocessor C flags With automake version 1.13.2 (which comes in debian testing/jessie), we were starting to get these warnings by default: ... Running automake --foreign ... atk/glue/Makefile.am:16: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') gio/glue/Makefile.am:11: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') gtk/glue/Makefile.am:18: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') gtk/gui-thread-check/profiler/Makefile.am:8: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') pango/glue/Makefile.am:13: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') sample/opaquetest/Makefile.am:18: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') sample/valtest/Makefile.am:18: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') Running autoconf ... ... We simply follow the warning's recommendation of using AM_CPPFLAGS instead (CPP meaning C PreProcessor, not C Plus Plus), as explained in http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html The deprecation of INCLUDES has been very long there already (since 2002, therefore Automake 1.7), and we already depend on automake 1.10. --- atk/glue/Makefile.am | 2 +- gio/glue/Makefile.am | 2 +- gtk/glue/Makefile.am | 2 +- gtk/gui-thread-check/profiler/Makefile.am | 2 +- pango/glue/Makefile.am | 2 +- sample/opaquetest/Makefile.am | 2 +- sample/valtest/Makefile.am | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atk/glue/Makefile.am b/atk/glue/Makefile.am index 79f7420f3..3efc6c222 100644 --- a/atk/glue/Makefile.am +++ b/atk/glue/Makefile.am @@ -13,7 +13,7 @@ nodist_libatksharpglue_3_la_SOURCES = generated.c libatksharpglue_3_la_LIBADD = $(ATK_LIBS) -INCLUDES = $(ATK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) +AM_CPPFLAGS = $(ATK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) libatksharpglue.dll: $(libatksharpglue_3_la_OBJECTS) libatksharpglue.rc libatksharpglue.def ./build-dll libatksharpglue-3 $(VERSION) diff --git a/gio/glue/Makefile.am b/gio/glue/Makefile.am index f58296de9..793b72788 100644 --- a/gio/glue/Makefile.am +++ b/gio/glue/Makefile.am @@ -8,7 +8,7 @@ libgiosharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined libgiosharpglue_3_la_LIBADD = $(GIO_LIBS) -INCLUDES = $(GIO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) +AM_CPPFLAGS = $(GIO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) libgiosharpglue.dll: $(libgiosharpglue_3_la_OBJECTS) libgiosharpglue.rc libgiosharpglue.def ./build-dll libgiosharpglue-3 $(VERSION) diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am index c21785795..f9fbdd24f 100644 --- a/gtk/glue/Makefile.am +++ b/gtk/glue/Makefile.am @@ -15,7 +15,7 @@ libgtksharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined libgtksharpglue_3_la_LIBADD = $(GTK_LIBS) -INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) +AM_CPPFLAGS = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) libgtksharpglue.dll: $(libgtksharpglue_3_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def ./build-dll libgtksharpglue-3 $(VERSION) diff --git a/gtk/gui-thread-check/profiler/Makefile.am b/gtk/gui-thread-check/profiler/Makefile.am index c253f70e5..21f7b141d 100644 --- a/gtk/gui-thread-check/profiler/Makefile.am +++ b/gtk/gui-thread-check/profiler/Makefile.am @@ -5,4 +5,4 @@ libmono_profiler_gui_thread_check_la_SOURCES = gui-thread-check.c libmono_profiler_gui_thread_check_la_LIBADD = @PROFILER_LIBS@ -INCLUDES = @PROFILER_CFLAGS@ -Wall +AM_CPPFLAGS = @PROFILER_CFLAGS@ -Wall diff --git a/pango/glue/Makefile.am b/pango/glue/Makefile.am index 9333baec0..ef3e3695d 100644 --- a/pango/glue/Makefile.am +++ b/pango/glue/Makefile.am @@ -10,7 +10,7 @@ libpangosharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined libpangosharpglue_3_la_LIBADD = $(PANGO_LIBS) -INCLUDES = $(PANGO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) +AM_CPPFLAGS = $(PANGO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) libpangosharpglue.dll: $(libpangosharpglue_3_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def ./build-dll libpangosharpglue-3 $(VERSION) diff --git a/sample/opaquetest/Makefile.am b/sample/opaquetest/Makefile.am index a1becf803..4d3237709 100644 --- a/sample/opaquetest/Makefile.am +++ b/sample/opaquetest/Makefile.am @@ -15,7 +15,7 @@ libopaque_la_LDFLAGS = -module -avoid-version -no-undefined libopaque_la_LIBADD = $(GTK_LIBS) -INCLUDES = $(GTK_CFLAGS) +AM_CPPFLAGS = $(GTK_CFLAGS) generated/*.cs: opaque-api.xml $(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/opaque-api.xml \ diff --git a/sample/valtest/Makefile.am b/sample/valtest/Makefile.am index 209535e2a..96073a0cc 100644 --- a/sample/valtest/Makefile.am +++ b/sample/valtest/Makefile.am @@ -15,7 +15,7 @@ libvalobj_la_LDFLAGS = -module -avoid-version -no-undefined libvalobj_la_LIBADD = $(GTK_LIBS) -INCLUDES = $(GTK_CFLAGS) +AM_CPPFLAGS = $(GTK_CFLAGS) Valobj.cs: valobj-api.xml $(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/valobj-api.xml \