From: Ray Strode Date: Wed, 11 Dec 2013 18:18:48 +0000 (-0500) Subject: build-goo: s/INCLUDES/AM_CPPFLAGS/ X-Git-Tag: 0.9.0~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1d303785867698345ee8ee361ef04fd11275868;p=thirdparty%2Fplymouth.git build-goo: s/INCLUDES/AM_CPPFLAGS/ This gets rid of some build warnings. --- diff --git a/src/Makefile.am b/src/Makefile.am index c535f21c..38034484 100644 --- 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 ead574a9..83b19cc5 100644 --- 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 287b11b2..960ffdc0 100644 --- 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 f70d1ed6..9013e567 100644 --- 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 41b3a463..de158081 100644 --- 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 296203b9..219930a3 100644 --- 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 8af55b0c..747f2021 100644 --- 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 44f9d6a6..12e14705 100644 --- 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 fd142c05..33513ac3 100644 --- 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 a6561294..3be47553 100644 --- 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 f7b559b6..6bbb490b 100644 --- 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 0f2b0f76..ce46df63 100644 --- 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 0d22a2e7..24fdb393 100644 --- 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 f4c21a8e..7ccefb2c 100644 --- 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 8f93fd29..2ac1b0cb 100644 --- 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 c1b3099f..9b11502b 100644 --- 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 7310d6c9..f3a6aaa9 100644 --- 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 628ef206..a16cd119 100644 --- 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 6ade690c..0c5c3ec1 100644 --- 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)