summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2013-11-08 23:36:13 +0100
committerinfirit <[email protected]>2013-11-08 23:36:13 +0100
commit86c43c5dbefda4a3a04a6bbeb5169d4521844e13 (patch)
tree6def43777b1a413422c18731258cdf634cafc5da
parent146f10a35bc8ce729e02f5abd78c33a2b52275d4 (diff)
downloadmate-settings-daemon-86c43c5dbefda4a3a04a6bbeb5169d4521844e13.tar.bz2
mate-settings-daemon-86c43c5dbefda4a3a04a6bbeb5169d4521844e13.tar.xz
INCLUDES -> AM_CPPFLAGS
-rw-r--r--mate-settings-daemon/Makefile.am3
-rw-r--r--plugins/media-keys/cut-n-paste/Makefile.am6
2 files changed, 5 insertions, 4 deletions
diff --git a/mate-settings-daemon/Makefile.am b/mate-settings-daemon/Makefile.am
index 778cb92..7fb6fdc 100644
--- a/mate-settings-daemon/Makefile.am
+++ b/mate-settings-daemon/Makefile.am
@@ -1,6 +1,6 @@
NULL =
-INCLUDES = \
+AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
@@ -21,6 +21,7 @@ libmsd_profile_la_SOURCES = \
$(NULL)
libmsd_profile_la_CPPFLAGS = \
+ $(AM_CPPFLAGS)
$(DISABLE_DEPRECATED_CFLAGS) \
$(NULL)
diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am
index 28a9f77..f5707da 100644
--- a/plugins/media-keys/cut-n-paste/Makefile.am
+++ b/plugins/media-keys/cut-n-paste/Makefile.am
@@ -2,7 +2,7 @@ NULL =
noinst_LTLIBRARIES = libgvc.la
-INCLUDES = \
+AM_CPPFLAGS = \
$(WARN_CFLAGS) \
$(NULL)
@@ -13,7 +13,7 @@ libgvc_la_SOURCES = \
$(NULL)
if HAVE_PULSE
-INCLUDES += \
+AM_CPPFLAGS += \
$(VOLUME_CONTROL_CFLAGS) \
$(PULSE_CFLAGS)
@@ -43,7 +43,7 @@ libgvc_la_SOURCES += \
endif
if HAVE_GSTREAMER
-INCLUDES += \
+AM_CPPFLAGS += \
$(SETTINGS_PLUGIN_CFLAGS) \
$(AM_CFLAGS) \
$(GST_CFLAGS)