build: s/INCLUDES/AM_CPPFLAGS/
authorColin Walters <walters@verbum.org>
Wed, 11 Dec 2013 15:50:56 +0000 (10:50 -0500)
committerAlejandro Piñeiro <apinheiro@igalia.com>
Wed, 11 Dec 2013 15:55:12 +0000 (16:55 +0100)
To silence automake deprecation warnings.

atk/Makefile.am
docs/Makefile.am

index 4c79fe4..7f008c3 100644 (file)
@@ -13,7 +13,7 @@ else
 no_undefined =
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        -DG_DISABLE_DEPRECATED  \
        -DATK_DISABLE_DEPRECATED        \
@@ -164,7 +164,7 @@ introspection_generated_sources = \
 
 Atk-1.0.gir: libatk-1.0.la Makefile
 Atk_1_0_gir_INCLUDES = GObject-2.0
-Atk_1_0_gir_CFLAGS = $(INCLUDES)
+Atk_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Atk_1_0_gir_LIBS = libatk-1.0.la
 Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk --warn-all --c-include "atk/atk.h"
 Atk_1_0_gir_FILES = \
@@ -232,7 +232,7 @@ dist-hook: ../build/win32/vs9/atk.vcproj ../build/win32/vs10/atk.vcxproj ../buil
        done >libatk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/atk.vcprojin >$@
        rm libatk.sourcefiles
-       
+
 ../build/win32/vs10/atk.vcxproj: ../build/win32/vs10/atk.vcxprojin
        for F in $(libatk_1_0_la_SOURCES); do \
                case $$F in \
@@ -242,7 +242,7 @@ dist-hook: ../build/win32/vs9/atk.vcproj ../build/win32/vs10/atk.vcxproj ../buil
        done >libatk.vs10.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs10/atk.vcxprojin >$@
        rm libatk.vs10.sourcefiles
-       
+
 ../build/win32/vs10/atk.vcxproj.filters: ../build/win32/vs10/atk.vcxproj.filtersin
        for F in $(libatk_1_0_la_SOURCES); do \
                case $$F in \
index 11ef943..99bff8f 100644 (file)
@@ -22,7 +22,7 @@ IGNORE_HFILES =       atkmarshal.h atkintl.h
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =                     \
+AM_CPPFLAGS =                  \
        -I$(top_srcdir)         \
        -I$(top_builddir)       \
        $(DEP_CFLAGS)