diff options
| author | Ondrej Holy <oholy@redhat.com> | 2014-01-16 17:41:51 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2014-01-17 13:45:08 +0100 |
| commit | 41994e8c32fb8a3a4fe9c441b1a57ac1d8fd2f1e (patch) | |
| tree | 9b3e3f39248d2d29fcb7d8884c58889e9c539e02 | |
| parent | 05218230f58891d8b87a56256452ca8342a77972 (diff) | |
| download | gvfs-41994e8c32fb8a3a4fe9c441b1a57ac1d8fd2f1e.tar.gz | |
build: replace obsolete INCLUDES by CPPFLAGS
https://bugzilla.gnome.org/show_bug.cgi?id=722354
| -rw-r--r-- | client/Makefile.am | 4 | ||||
| -rw-r--r-- | common/Makefile.am | 2 | ||||
| -rw-r--r-- | daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | metadata/Makefile.am | 2 | ||||
| -rw-r--r-- | programs/Makefile.am | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 356bb578..8c7b76a1 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,6 +1,6 @@ NULL = -INCLUDES = -I$(top_srcdir) \ +AM_CPPFLAGS = -I$(top_srcdir) \ -I$(top_srcdir)/client \ -I$(top_srcdir)/metadata \ -I$(top_builddir)/metadata \ @@ -59,7 +59,7 @@ noinst_PROGRAMS = test-uri-utils test_uri_utils_SOURCES = test-uri-utils.c gvfsuriutils.c gvfsuriutils.h test_uri_utils_LDADD = $(vfslibs) -test_uri_utils_CFLAGS = $(INCLUDES) +test_uri_utils_CFLAGS = $(AM_CPPFLAGS) if USE_FUSE diff --git a/common/Makefile.am b/common/Makefile.am index 3395aea6..7f06cd4b 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -3,7 +3,7 @@ NULL = pkglib_LTLIBRARIES=libgvfscommon.la noinst_LTLIBRARIES = libgvfscommon-monitor.la -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gvfs \ -I$(top_srcdir)/daemon \ $(GLIB_CFLAGS) $(BLURAY_CFLAGS) \ -DG_LOG_DOMAIN=\"GVFS\" diff --git a/daemon/Makefile.am b/daemon/Makefile.am index b418a6f9..20d422f4 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -4,7 +4,7 @@ NULL = mountdir = $(datadir)/gvfs/mounts -INCLUDES = \ +AM_CPPFLAGS = \ $(SAMBA_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ diff --git a/metadata/Makefile.am b/metadata/Makefile.am index 25579945..e86e1c92 100644 --- a/metadata/Makefile.am +++ b/metadata/Makefile.am @@ -30,7 +30,7 @@ libexec_PROGRAMS =\ gvfsd-metadata \ $(NULL) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common \ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common \ $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ $(UDEV_CFLAGS) \ -DGVFS_LOCALEDIR=\""$(localedir)"\" \ diff --git a/programs/Makefile.am b/programs/Makefile.am index d268c717..8291acb2 100644 --- a/programs/Makefile.am +++ b/programs/Makefile.am @@ -1,6 +1,6 @@ NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(GLIB_CFLAGS) \ |