GNOME.org
 

[gnome-applets] build: Use AM_CPPFLAGS instead of INCLUDES

commit 5513d7397c0e4146db5a45ed5888f8bc5128df6e
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun Jul 21 12:53:19 2013 -0400

    build: Use AM_CPPFLAGS instead of INCLUDES
    
    Fixes warning with automake 1.13

 accessx-status/Makefile.am               |    2 +-
 battstat/Makefile.am                     |    2 +-
 battstat/apmlib/Makefile.am              |    2 +-
 charpick/Makefile.am                     |    2 +-
 cpufreq/src/Makefile.am                  |    2 +-
 cpufreq/src/cpufreq-selector/Makefile.am |    4 ++--
 drivemount/Makefile.am                   |    2 +-
 geyes/Makefile.am                        |    2 +-
 gweather/Makefile.am                     |    2 +-
 mini-commander/src/Makefile.am           |    2 +-
 mixer/Makefile.am                        |    2 +-
 modemlights/Makefile.am                  |    2 +-
 multiload/Makefile.am                    |    2 +-
 null_applet/Makefile.am                  |    2 +-
 stickynotes/Makefile.am                  |    2 +-
 trashapplet/src/Makefile.am              |    2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index edd4ff2..b98c5cc 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help pixmaps
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GNOME_APPLETS_CFLAGS) \
        $(GIO_CFLAGS)           \
        $(GIO_UNIX_CFLAGS)      \
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 1a16f76..88a6cdf 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = help sounds $(APMDIR)
 
 DIST_SUBDIRS = help sounds apmlib
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        $(GNOME_APPLETS_CFLAGS)                 \
        $(LIBNOTIFY_CFLAGS)                     \
        $(HAL_CFLAGS)                           \
diff --git a/battstat/apmlib/Makefile.am b/battstat/apmlib/Makefile.am
index e8c979f..3844990 100644
--- a/battstat/apmlib/Makefile.am
+++ b/battstat/apmlib/Makefile.am
@@ -4,7 +4,7 @@
 # Created: Thu Jun 15 23:08:41 CEST 2000
 #
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/apmlib                  \
        $(GNOME_APPLETS_CFLAGS)                 \
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index b148405..d9a6ef4 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        -I.                                     \
        -I$(srcdir)                             \
        -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\"   \
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 035b057..8dfd9fe 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -4,7 +4,7 @@ endif
 
 SUBDIRS = $(selector_SUBDIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\"            \
        $(GNOME_APPLETS_CFLAGS)                                 \
        $(LIBGLADE_CFLAGS)                                      \
diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/cpufreq/src/cpufreq-selector/Makefile.am
index e3c975c..7971a62 100644
--- a/cpufreq/src/cpufreq-selector/Makefile.am
+++ b/cpufreq/src/cpufreq-selector/Makefile.am
@@ -1,9 +1,9 @@
 cpufreqselectordir = $(bindir)
 
-INCLUDES = $(CPUFREQ_SELECTOR_CFLAGS)
+AM_CPPFLAGS = $(CPUFREQ_SELECTOR_CFLAGS)
 
 if HAVE_POLKIT
-INCLUDES += \
+AM_CPPFLAGS += \
        $(DBUS_CFLAGS)          \
        $(POLKIT_CFLAGS)
 endif
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index adee66f..bc77638 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        -I.                                     \
        -I$(srcdir)                             \
        -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index ebb6372..f0b59c4 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help themes
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -I.                                             \
        -I$(srcdir)                                     \
        $(GNOME_APPLETS_CFLAGS)                         \
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index ea93c70..24e93a1 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = help
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        -I$(srcdir)                             \
        -I$(top_srcdir)                         \
        -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\"   \
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index 9c3d5ad..23e1d93 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I.                             \
        -I$(srcdir)                     \
        -DMC_MENU_UI_DIR=\""$(uidir)"\" \
diff --git a/mixer/Makefile.am b/mixer/Makefile.am
index 656b563..bc31b16 100644
--- a/mixer/Makefile.am
+++ b/mixer/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help
 
-INCLUDES = -I. -I$(srcdir)                     \
+AM_CPPFLAGS = -I. -I$(srcdir)                  \
        -DMIXER_MENU_UI_DIR=\""$(uidir)"\"      \
        $(MIXER_CFLAGS)                         \
        $(GNOME_APPLETS_CFLAGS)                 \
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index 9767c97..f1b8efd 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -1,6 +1,6 @@
 #SUBDIRS = help
 
-INCLUDES = -I. -I$(srcdir)                             \
+AM_CPPFLAGS = -I. -I$(srcdir)                          \
        -DMODEM_MENU_UI_DIR=\""$(uidir)"\"              \
        $(GNOME_APPLETS_CFLAGS)                         \
        $(WARN_CFLAGS)
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index e015654..a98f66e 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help
 
-INCLUDES =                     \
+AM_CPPFLAGS =                  \
        -I$(srcdir)             \
        -DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am
index 680eba6..ac42edd 100644
--- a/null_applet/Makefile.am
+++ b/null_applet/Makefile.am
@@ -1,7 +1,7 @@
 applet_in_files = org.gnome.applets.NullApplet.panel-applet.in
 service_in_files = org.gnome.panel.applet.NullAppletFactory.service.in
 
-INCLUDES =                     \
+AM_CPPFLAGS =                  \
        -I.                     \
        -I$(srcdir)             \
        $(GNOME_APPLETS_CFLAGS) \
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index c3e3a02..4ac31b4 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -9,7 +9,7 @@ service_in_files = org.gnome.panel.applet.StickyNotesAppletFactory.service.in
 schemas_in_files = stickynotes.schemas.in
 
 if BUILD_STICKYNOTES_APPLET
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        -I.                                     \
        -I$(srcdir)                             \
        $(GNOME_APPLETS_CFLAGS)                 \
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index f7c232e..7b579ea 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)             \
+AM_CPPFLAGS = -I$(top_srcdir)          \
           $(GNOME_APPLETS_CFLAGS)      \
           $(GIO_CFLAGS)                \
           $(WARN_CFLAGS)               \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]