From bfc5cbef4b0d3a95246d38af041f668068afda57 Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Sun, 11 Nov 2012 06:38:09 +0200
Subject: [build] Update all Makefile.am to more recent standards

http://git.gnome.org/browse/gnome-desktop/commit/?id=4c3d78c930ecb833a677f534ef6cd697d3d92169
---
 libmate-desktop/Makefile.am           | 18 ++++++++++--------
 libmate-desktop/libmateui/Makefile.am | 12 ++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'libmate-desktop')

diff --git a/libmate-desktop/Makefile.am b/libmate-desktop/Makefile.am
index 322963e..4007291 100644
--- a/libmate-desktop/Makefile.am
+++ b/libmate-desktop/Makefile.am
@@ -1,14 +1,16 @@
 SUBDIRS = libmate libmateui
 
-INCLUDES =							\
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\""  \
-	-DPNP_IDS=\""$(PNP_IDS)"\"				\
-	$(WARN_CFLAGS)						\
-	$(DISABLE_DEPRECATED)					\
+lib_LTLIBRARIES = libmate-desktop-2.la
+
+AM_CPPFLAGS =							\
+	$(MATE_DESKTOP_CFLAGS)					\
 	$(XLIB_CFLAGS)						\
-	$(MATE_DESKTOP_CFLAGS)
+	-DG_LOG_DOMAIN=\"MateDesktop\"				\
+	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\""	\
+	-DPNP_IDS=\""$(PNP_IDS)"\"				\
+	$(DISABLE_DEPRECATED)
 
-lib_LTLIBRARIES = libmate-desktop-2.la
+AM_CFLAGS = $(WARN_CFLAGS)
 
 noinst_PROGRAMS = test-ditem
 
@@ -47,11 +49,11 @@ test_ditem_LDADD = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mate-desktop-2.0.pc
 
-pnpdata_DATA_dist = pnp.ids
 if USE_INTERNAL_PNP_IDS
 pnpdatadir = $(datadir)/libmate-desktop
 pnpdata_DATA = pnp.ids
 endif
+pnpdata_DATA_dist = pnp.ids
 
 check:
 	test -s $(top_srcdir)/libmate-desktop/pnp.ids
diff --git a/libmate-desktop/libmateui/Makefile.am b/libmate-desktop/libmateui/Makefile.am
index ca42525..413fee0 100644
--- a/libmate-desktop/libmateui/Makefile.am
+++ b/libmate-desktop/libmateui/Makefile.am
@@ -1,10 +1,10 @@
 libmateui_desktopdir = $(includedir)/mate-desktop-2.0/libmateui
-libmateui_desktop_HEADERS =	\
-	mate-bg.h		\
-	mate-bg-crossfade.h	\
-	mate-desktop-thumbnail.h \
-	mate-rr.h		\
-	mate-rr-config.h	\
+libmateui_desktop_HEADERS =		\
+	mate-bg.h			\
+	mate-bg-crossfade.h		\
+	mate-desktop-thumbnail.h	\
+	mate-rr.h			\
+	mate-rr-config.h		\
 	mate-rr-labeler.h
 
 -include $(top_srcdir)/git.mk
-- 
cgit v1.2.1