build-goo: s/INCLUDES/AM_CPPFLAGS/

This gets rid of some build warnings.

diff --git a/src/Makefile.am b/src/Makefile.am
index c535f21c0c7f925ff99e90bcfe253b83fb54ff99..38034484eb3f874b2f6665e9e04ca89d022c8ba1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client view
 if ENABLE_UPSTART_MONITORING
 SUBDIRS += upstart-bridge
 endif
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/libply                                                 \
            -I$(srcdir)/libply-splash-core                                     \
            -I$(srcdir)                                                        \

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index ead574a9eab948b42fb8c0a1bb189915fa2d6320..83b19cc536e28bc76558d269fe7d766224163baf 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(top_srcdir)/src                                                \
            -I$(top_srcdir)/src/libply                                         \
            -I$(srcdir)

diff --git a/src/libply-splash-core/Makefile.am b/src/libply-splash-core/Makefile.am
index 287b11b2b37ce6eb1c6bb2a219e86bee2bfe2fab..960ffdc035f1b9073be77a8f8cf62c830b2ed76e 100644 (file)
--- a/src/libply-splash-core/Makefile.am
+++ b/src/libply-splash-core/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)                                                        \
            -I$(srcdir)/../libply                                              \
            -I$(srcdir)/../plugins/controls

diff --git a/src/libply-splash-graphics/Makefile.am b/src/libply-splash-graphics/Makefile.am
index f70d1ed6ab0dd93a65a7375d6ef7401fbcc15cc2..9013e567d05fad31b0e971ed2ae4b05e8eba9c2d 100644 (file)
--- a/src/libply-splash-graphics/Makefile.am
+++ b/src/libply-splash-graphics/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)                                                        \
            -I$(srcdir)/../libply                                              \
            -I$(srcdir)/../libply-splash-core                                  \

diff --git a/src/libply/Makefile.am b/src/libply/Makefile.am
index 41b3a46342b2d6e22cba4431278bd81565f9e73e..de15808102547868fafa0504cc5f917db6f75561 100644 (file)
--- a/src/libply/Makefile.am
+++ b/src/libply/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)                                                        \
            -DPLYMOUTH_TIME_DIRECTORY=\"$(localstatedir)/lib/plymouth/\"       
 

diff --git a/src/plugins/controls/label/Makefile.am b/src/plugins/controls/label/Makefile.am
index 296203b9d66771f3fbca8968555d49241ee715cd..219930a37a9173c757ffd40b5e2e2c280fe2dc7b 100644 (file)
--- a/src/plugins/controls/label/Makefile.am
+++ b/src/plugins/controls/label/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../../libply-splash-graphics                        \

diff --git a/src/plugins/renderers/drm/Makefile.am b/src/plugins/renderers/drm/Makefile.am
index 8af55b0c3b33a89538128a694c9ddc7ac2e9ea2e..747f20215bdb01ef314473063e53a28a26c86ac4 100644 (file)
--- a/src/plugins/renderers/drm/Makefile.am
+++ b/src/plugins/renderers/drm/Makefile.am
@@ -1,5 +1,5 @@
 if ENABLE_DRM_RENDERER
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../..                                               \

diff --git a/src/plugins/renderers/frame-buffer/Makefile.am b/src/plugins/renderers/frame-buffer/Makefile.am
index 44f9d6a6d305b332b80730fc01d4f745dae9dec6..12e14705a4f63772d15ed947dbec26c8320e4082 100644 (file)
--- a/src/plugins/renderers/frame-buffer/Makefile.am
+++ b/src/plugins/renderers/frame-buffer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../..                                               \

diff --git a/src/plugins/renderers/x11/Makefile.am b/src/plugins/renderers/x11/Makefile.am
index fd142c05ecd5bbff08a1fd3a7bb69a185f6b8905..33513ac37c948f620c535f217e30669af9c8358e 100644 (file)
--- a/src/plugins/renderers/x11/Makefile.am
+++ b/src/plugins/renderers/x11/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../..                                               \

diff --git a/src/plugins/splash/details/Makefile.am b/src/plugins/splash/details/Makefile.am
index a6561294df2e349974d268d1c5c1b4367bdf37bc..3be4755300a3c8433b1a5063603a30f33b9033c2 100644 (file)
--- a/src/plugins/splash/details/Makefile.am
+++ b/src/plugins/splash/details/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../..                                               \

diff --git a/src/plugins/splash/fade-throbber/Makefile.am b/src/plugins/splash/fade-throbber/Makefile.am
index f7b559b6f52043c5103e52427137d956930a17ea..6bbb490b0ac9eb2fba0e1faf92b0fff21e69b9ee 100644 (file)
--- a/src/plugins/splash/fade-throbber/Makefile.am
+++ b/src/plugins/splash/fade-throbber/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../../libply-splash-graphics                        \

diff --git a/src/plugins/splash/script/Makefile.am b/src/plugins/splash/script/Makefile.am
index 0f2b0f76701377a5305f9770e0b292f9f97fae02..ce46df63ecc155fefdef902a6273856a79c37004 100644 (file)
--- a/src/plugins/splash/script/Makefile.am
+++ b/src/plugins/splash/script/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../../libply-splash-graphics                        \

diff --git a/src/plugins/splash/space-flares/Makefile.am b/src/plugins/splash/space-flares/Makefile.am
index 0d22a2e7bcf7ef103fd9e113dc021c81e0041a39..24fdb393475575e9485ef42b7283b4782b643056 100644 (file)
--- a/src/plugins/splash/space-flares/Makefile.am
+++ b/src/plugins/splash/space-flares/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../../libply-splash-graphics                        \

diff --git a/src/plugins/splash/text/Makefile.am b/src/plugins/splash/text/Makefile.am
index f4c21a8e125ba22a7e4ee31e2180191355cb4c2c..7ccefb2c5d2264c7c158512a243aa05461780e7e 100644 (file)
--- a/src/plugins/splash/text/Makefile.am
+++ b/src/plugins/splash/text/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../..                                               \

diff --git a/src/plugins/splash/throbgress/Makefile.am b/src/plugins/splash/throbgress/Makefile.am
index 8f93fd29949bcd116691a0b832444dd9bbd696c4..2ac1b0cb599630409d9ea77ca24fe377ebb8ffe4 100644 (file)
--- a/src/plugins/splash/throbgress/Makefile.am
+++ b/src/plugins/splash/throbgress/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../../libply-splash-graphics                        \

diff --git a/src/plugins/splash/tribar/Makefile.am b/src/plugins/splash/tribar/Makefile.am
index c1b3099f8f926b956d116f560ecdde54514591d9..9b11502be1a697114ead1b16eea1874a2cd05269 100644 (file)
--- a/src/plugins/splash/tribar/Makefile.am
+++ b/src/plugins/splash/tribar/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../..                                               \

diff --git a/src/plugins/splash/two-step/Makefile.am b/src/plugins/splash/two-step/Makefile.am
index 7310d6c9a8dede29edc6d755c112c70f5a3d81b2..f3a6aaa9956941ddfb3370ee007691c337410f5d 100644 (file)
--- a/src/plugins/splash/two-step/Makefile.am
+++ b/src/plugins/splash/two-step/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
            -I$(srcdir)/../../../libply-splash-graphics                        \

diff --git a/src/upstart-bridge/Makefile.am b/src/upstart-bridge/Makefile.am
index 628ef20697dc0056a5a9bbc374c75587aea11771..a16cd119444c37eb8adee32b7a7f40eb9b5d20a0 100644 (file)
--- a/src/upstart-bridge/Makefile.am
+++ b/src/upstart-bridge/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(top_srcdir)/src                                                \
            -I$(top_srcdir)/src/libply                                         \
            -I$(top_srcdir)/src/client                                         \

diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am
index 6ade690c09801c1756fd77d9e4c85c777405ae6e..0c5c3ec1389377dc5265832b79818412e95350d0 100644 (file)
--- a/src/viewer/Makefile.am
+++ b/src/viewer/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = .
 EXTRA_DIST=
 
-INCLUDES = -I$(top_srcdir)                                                    \
+AM_CPPFLAGS = -I$(top_srcdir)                                                 \
            -I$(srcdir)
 if WITH_LOG_VIEWER
 plymouth_log_viewerdir = $(bindir)