From 64106e463750c301ad6183fc87e0fc81037e9f9b Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 8 Nov 2013 23:36:13 +0100 Subject: INCLUDES -> AM_CPPFLAGS --- mate-settings-daemon/Makefile.am | 3 ++- plugins/media-keys/cut-n-paste/Makefile.am | 6 +++--- 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) -- cgit v1.2.1