[Xfce4-commits] <xfce4-mixer:master> Use CPPFLAGS in Makefiles

[Guido Berhoerster]

Updating branch refs/heads/master
         to dad36c37b03c420fd904c3fa98f4b25c9094cc65 (commit)
       from 54f6ac04677a7caac0dcd8dcb1dd1a7e44d05490 (commit)

commit dad36c37b03c420fd904c3fa98f4b25c9094cc65
Author: Guido Berhoerster <guido+xfce at berhoerster.name>
Date:   Thu Sep 27 16:31:08 2012 +0200

    Use CPPFLAGS in Makefiles

 libxfce4mixer/Makefile.am |    6 ++++--
 panel-plugin/Makefile.am  |    6 ++++--
 xfce4-mixer/Makefile.am   |    8 +++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libxfce4mixer/Makefile.am b/libxfce4mixer/Makefile.am
index 4107cdd..792a95e 100644
--- a/libxfce4mixer/Makefile.am
+++ b/libxfce4mixer/Makefile.am
@@ -19,13 +19,15 @@ libxfce4mixer_la_SOURCES =						\
 	xfce-mixer-debug.h						\
 	xfce-mixer-debug.c
 
-libxfce4mixer_la_CFLAGS = 						\
+libxfce4mixer_la_CPPFLAGS = 						\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DDATADIR=\"$(datadir)\"					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DG_LOG_DOMAIN=\"libxfce4mixer\"				\
-	-DMIXER_DATADIR=\"$(pkgdatadir)\"				\
+	-DMIXER_DATADIR=\"$(pkgdatadir)\"
+
+libxfce4mixer_la_CFLAGS = 						\
 	$(PLATFORM_CFLAGS)						\
 	$(GLIB_CFLAGS)							\
 	$(GTK_FLAGS)							\
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index fa27e29..a494682 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -12,12 +12,14 @@ libmixer_la_SOURCES =							\
 	xfce-mixer-plugin.h						\
 	xfce-mixer-plugin.c
 
-libmixer_la_CFLAGS =							\
+libmixer_la_CPPFLAGS =							\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DDATADIR=\"$(datadir)\"					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
-	-DG_LOG_DOMAIN=\"xfce4-mixer-plugin\"				\
+	-DG_LOG_DOMAIN=\"xfce4-mixer-plugin\"
+
+libmixer_la_CFLAGS =							\
 	$(PLATFORM_CFLAGS)						\
 	$(GLIB_CFLAGS)							\
 	$(GTK_CFLAGS)							\
diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am
index 8735737..819ab28 100644
--- a/xfce4-mixer/Makefile.am
+++ b/xfce4-mixer/Makefile.am
@@ -18,13 +18,15 @@ xfce4_mixer_SOURCES =							\
 	xfce-mixer-window.h						\
 	xfce-mixer-window.c
 
-xfce4_mixer_CFLAGS = 							\
+xfce4_mixer_CPPFLAGS = 							\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DDATADIR=\"$(datadir)\"					\
 	-DMIXER_DATADIR=\"$(pkgdatadir)\"				\
-	-DG_LOG_DOMAIN=\"xfce4-mixer\"					\
+	-DG_LOG_DOMAIN=\"xfce4-mixer\"
+
+xfce4_mixer_CFLAGS = 							\
 	$(GLIB_CFLAGS)							\
 	$(GTK_CFLAGS)							\
 	$(UNIQUE_CFLAGS)						\
@@ -35,7 +37,7 @@ xfce4_mixer_CFLAGS = 							\
 
 xfce4_mixer_DEPENDENCIES = 						\
 	$(top_builddir)/libxfce4mixer/libxfce4mixer.la
-	
+
 xfce4_mixer_LDFLAGS = 							\
 	$(top_builddir)/libxfce4mixer/libxfce4mixer.la			\
 	$(GLIB_LIBS)							\