[gnome-control-center] power: Use AM_CPPFLAGS rather than INCLUDES
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] power: Use AM_CPPFLAGS rather than INCLUDES
- Date: Wed, 25 Jun 2014 10:52:01 +0000 (UTC)
commit 229ab01a12b30cc4687623aa1e2c498f932414fb
Author: Christophe Fergeau <cfergeau redhat com>
Date: Wed Jun 25 11:56:03 2014 +0200
power: Use AM_CPPFLAGS rather than INCLUDES
This is deprecated in newer automake versions, and this causes warnings
with automake 1.14:
panels/printers/Makefile.am:3: warning: 'INCLUDES' is the old name for
AM_CPPFLAGS' (or '*_CPPFLAGS')
https://bugzilla.gnome.org/show_bug.cgi?id=732189
panels/power/Makefile.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/panels/power/Makefile.am b/panels/power/Makefile.am
index 6c7c3f2..1edad41 100644
--- a/panels/power/Makefile.am
+++ b/panels/power/Makefile.am
@@ -2,7 +2,7 @@ cappletname = power
SUBDIRS = icons
-INCLUDES = \
+AM_CPPFLAGS = \
$(PANEL_CFLAGS) \
$(POWER_PANEL_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
@@ -23,12 +23,12 @@ libpower_la_SOURCES = \
libpower_la_LIBADD = $(PANEL_LIBS) $(POWER_PANEL_LIBS)
if BUILD_BLUETOOTH
-INCLUDES += $(BLUETOOTH_CFLAGS)
+AM_CPPFLAGS += $(BLUETOOTH_CFLAGS)
libpower_la_LIBADD += $(BLUETOOTH_LIBS)
endif
if BUILD_NETWORK
-INCLUDES += $(NETWORK_MANAGER_CFLAGS)
+AM_CPPFLAGS += $(NETWORK_MANAGER_CFLAGS)
libpower_la_LIBADD += $(NETWORK_MANAGER_LIBS)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]