GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 9473dd41 authored by Andrés G. Aragoneses's avatar Andrés G. Aragoneses

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's avatarAlexander Larsson <alexl@redhat.com>
parent b3ce9987
......@@ -2,7 +2,7 @@ NULL=
noinst_LTLIBRARIES=libeel-2.la
INCLUDES = \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Eel\" \
-I$(top_srcdir) \
-I$(top_builddir) \
......
......@@ -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) \
......
......@@ -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) \
......
include $(top_srcdir)/Makefile.shared
INCLUDES=\
AM_CPPFLAGS=\
-I$(top_srcdir) \
-I$(top_builddir) \
$(BASE_CFLAGS) \
......
......@@ -10,7 +10,7 @@ libexec_PROGRAMS= \
nautilus-convert-metadata \
$(NULL)
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir)/libnautilus-private \
$(BASE_CFLAGS) \
......
NULL=
INCLUDES =\
AM_CPPFLAGS =\
-I$(top_srcdir) \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment