[gvfs] build: replace obsolete INCLUDES by CPPFLAGS
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] build: replace obsolete INCLUDES by CPPFLAGS
- Date: Fri, 17 Jan 2014 12:47:15 +0000 (UTC)
commit 41994e8c32fb8a3a4fe9c441b1a57ac1d8fd2f1e
Author: Ondrej Holy <oholy redhat com>
Date: Thu Jan 16 17:41:51 2014 +0100
build: replace obsolete INCLUDES by CPPFLAGS
https://bugzilla.gnome.org/show_bug.cgi?id=722354
client/Makefile.am | 4 ++--
common/Makefile.am | 2 +-
daemon/Makefile.am | 2 +-
metadata/Makefile.am | 2 +-
programs/Makefile.am | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/client/Makefile.am b/client/Makefile.am
index 356bb57..8c7b76a 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 3395aea..7f06cd4 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 b418a6f..20d422f 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 2557994..e86e1c9 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 d268c71..8291acb 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) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]