From c76841b1f470c7daf62df9482a55e1143a77086c Mon Sep 17 00:00:00 2001
From: raveit <chat-to-me@raveit.de>
Date: Sun, 30 Jun 2013 15:43:30 +0200
Subject: fix multiply defined AM_CPPFLAGS/INCLUDES in /shell/Makefile.am

---
 shell/Makefile.am | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'shell')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 858ffa53..fcc95531 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,10 +1,11 @@
 REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
 REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
-	$(REAL_LIBSLAB_CFLAGS)			\
-	$(MATECC_SHELL_CFLAGS)
+	$(REAL_LIBSLAB_CFLAGS)		\
+	$(MATECC_SHELL_CFLAGS)  	\
+	-DMATELOCALEDIR="\"$(datadir)/locale\""
 
 bin_PROGRAMS = mate-control-center 
 
@@ -15,9 +16,6 @@ mate_control_center_LDADD =						\
 	$(MATECC_SHELL_LIBS)						\
 	$(REAL_LIBSLAB_LIBS)
 
-AM_CPPFLAGS =							\
-	-DMATELOCALEDIR="\"$(datadir)/locale\""
-
 sysdir = $(datadir)/applications
 sys_in_files = matecc.desktop.in
 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-- 
cgit v1.2.1