[nautilus] build: stop using INCLUDES, deprecated by automake 1.7



commit 9473dd41c1d465e0055643b91dcc1552a35b7428
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Tue Jun 18 11:30:31 2013 +0200

    build: stop using INCLUDES, deprecated by automake 1.7
    
    We already depend on automake 1.9, so using the replacement of
    INCLUDES (AM_CPPFLAGS) won't hurt, especially now that it is
    a warning shown by default since automake 1.13, as evidenced by
    this build log of mine:
    
    Makefile.am: installing './INSTALL'
    eel/Makefile.am:5: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
    eel/Makefile.am: installing './depcomp'
    parallel-tests: installing './test-driver'
    libnautilus-extension/Makefile.am:7: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or 
'*_CPPFLAGS')
    libnautilus-private/Makefile.am:5: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
    nautilus-sendto-extension/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or 
'*_CPPFLAGS')
    src/Makefile.am:13: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
    test/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
    
    Signed-off-by: Alexander Larsson <alexl redhat com>

 eel/Makefile.am                       |    2 +-
 libnautilus-extension/Makefile.am     |    2 +-
 libnautilus-private/Makefile.am       |    2 +-
 nautilus-sendto-extension/Makefile.am |    2 +-
 src/Makefile.am                       |    2 +-
 test/Makefile.am                      |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/eel/Makefile.am b/eel/Makefile.am
index c14ccc5..2b65097 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -2,7 +2,7 @@ NULL=
 
 noinst_LTLIBRARIES=libeel-2.la
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DG_LOG_DOMAIN=\"Eel\"                          \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
index 17af474..389d637 100644
--- a/libnautilus-extension/Makefile.am
+++ b/libnautilus-extension/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.shared
 
 lib_LTLIBRARIES=libnautilus-extension.la
 
-INCLUDES=\
+AM_CPPFLAGS=\
        -I$(top_srcdir) \
        -I$(top_builddir) \
        $(BASE_CFLAGS) \
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index e0db4d0..d1d0401 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.shared
 
 noinst_LTLIBRARIES=libnautilus-private.la
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
        $(BASE_CFLAGS)                                  \
diff --git a/nautilus-sendto-extension/Makefile.am b/nautilus-sendto-extension/Makefile.am
index fde6c30..8fa6687 100644
--- a/nautilus-sendto-extension/Makefile.am
+++ b/nautilus-sendto-extension/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.shared
 
-INCLUDES=\
+AM_CPPFLAGS=\
        -I$(top_srcdir) \
        -I$(top_builddir) \
        $(BASE_CFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 9006aba..651fccc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ libexec_PROGRAMS=                             \
        nautilus-convert-metadata               \
        $(NULL)
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_srcdir)                                         \
        -I$(top_builddir)/libnautilus-private                   \
        $(BASE_CFLAGS)                                          \
diff --git a/test/Makefile.am b/test/Makefile.am
index 25d980b..d9ff912 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-INCLUDES =\
+AM_CPPFLAGS =\
        -I$(top_srcdir) \
        $(BASE_CFLAGS) \
        $(COMMON_CFLAGS) \


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