[gnome-control-center] shell: Use AM_CPPFLAGS rather than INCLUDES



commit c61d9e5a95d0332d68f7494782870d5878e6a75b
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Wed Jun 25 11:59:06 2014 +0200

    shell: 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

 shell/Makefile.am |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 3b15cbb..d6b4783 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
+       -DGNOMELOCALEDIR="\"$(datadir)/locale\""\
        -I$(top_srcdir)                         \
        $(SHELL_CFLAGS)                         \
        $(CHEESE_CFLAGS)                        \
@@ -87,8 +88,6 @@ if BUILD_BLUETOOTH
 gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
 endif
 
-AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
-
 # Dbus service file
 servicefiledir = $(datadir)/dbus-1/services
 servicefile_in_files = org.gnome.ControlCenter.service.in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]