[gnome-desktop] build: Update all Makefile.am to more recent standards

[Vincent Untz <vuntz src gnome org>]

commit 4c3d78c930ecb833a677f534ef6cd697d3d92169
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Sep 20 17:40:55 2010 +0200

    build: Update all Makefile.am to more recent standards

 Makefile.am                             |   15 ++++++---------
 gnome-about/Makefile.am                 |   16 ++++++++--------
 libgnome-desktop/Makefile.am            |   22 ++++++++++++----------
 libgnome-desktop/libgnomeui/Makefile.am |   12 ++++++------
 4 files changed, 32 insertions(+), 33 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 14835a7..7f1de39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS =			\
-	po 			\
-	libgnome-desktop 	\
-	docs			\
-	man
+SUBDIRS = libgnome-desktop man docs po
 
 if GNOME_ABOUT_ENABLED
 SUBDIRS += gnome-about
@@ -13,10 +9,13 @@ endif
 
 ACLOCAL_AMFLAGS = -I m4
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
+
 if GNOME_ABOUT_ENABLED
-versiondir=$(datadir)/gnome-about
-version_DATA=gnome-version.xml
+versiondir = $(datadir)/gnome-about
+version_DATA = gnome-version.xml
 endif
+
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST =			\
@@ -27,8 +26,6 @@ EXTRA_DIST =			\
 	gnome-version.xml.in.in	\
 	gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
-
 CLEANFILES = \
 	$(version_DATA)
 
diff --git a/gnome-about/Makefile.am b/gnome-about/Makefile.am
index b72afe8..cdd819f 100644
--- a/gnome-about/Makefile.am
+++ b/gnome-about/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = headers
+
 bin_SCRIPTS = gnome-about
 
 gnome-about: gnome-about.in Makefile
@@ -12,24 +14,22 @@ gnome-about: gnome-about.in Makefile
 		< $< > $@ &&						\
 	chmod a+x $@
 
- INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 desktop_in_files = gnome-about.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+ INTLTOOL_DESKTOP_RULE@
+
 aboutdir = $(datadir)/gnome-about
 about_DATA = gnome-64.png contributors.list foundation-members.list
 
-EXTRA_DIST = $(about_DATA) gnome-about.in
-
-SUBDIRS = headers
-
-CLEANFILES = gnome-about.desktop gnome-about
-
 check:
 	test -s $(top_srcdir)/gnome-about/foundation-members.list
 
+EXTRA_DIST = $(about_DATA) gnome-about.in
+
+CLEANFILES = $(desktop_DATA) gnome-about
+
 MAINTAINERCLEANFILES = \
 	foundation-members.list
 
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index b429177..9c775c6 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -1,14 +1,16 @@
 SUBDIRS = libgnome libgnomeui
 
-INCLUDES =							\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\""  \
-	-DPNP_IDS=\""$(PNP_IDS)"\"				\
-	$(WARN_CFLAGS)						\
-	$(DISABLE_DEPRECATED)					\
+lib_LTLIBRARIES = libgnome-desktop-3.la
+
+AM_CPPFLAGS =							\
+	$(GNOME_DESKTOP_CFLAGS)					\
 	$(XLIB_CFLAGS)						\
-	$(GNOME_DESKTOP_CFLAGS)
+	-DG_LOG_DOMAIN=\"GnomeDesktop\"				\
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\""	\
+	-DPNP_IDS=\""$(PNP_IDS)"\"				\
+	$(DISABLE_DEPRECATED)
 
-lib_LTLIBRARIES = libgnome-desktop-3.la
+AM_CFLAGS = $(WARN_CFLAGS)
 
 libgnome_desktop_3_la_SOURCES = \
 	gnome-desktop-utils.c	\
@@ -36,18 +38,18 @@ libgnome_desktop_3_la_LDFLAGS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnome-desktop-3.0.pc
 
-pnpdata_DATA_dist = pnp.ids
 if USE_INTERNAL_PNP_IDS
 pnpdatadir = $(datadir)/libgnome-desktop-3.0
 pnpdata_DATA = pnp.ids
 endif
+pnpdata_DATA_dist = pnp.ids
 
 check:
 	test -s $(top_srcdir)/libgnome-desktop/pnp.ids
 
 EXTRA_DIST = \
-	gnome-desktop-3.0.pc.in                \
-	gnome-desktop-3.0-uninstalled.pc.in    \
+	gnome-desktop-3.0.pc.in			\
+	gnome-desktop-3.0-uninstalled.pc.in	\
 	$(pnpdata_DATA_dist)
 
 MAINTAINERCLEANFILES = \
diff --git a/libgnome-desktop/libgnomeui/Makefile.am b/libgnome-desktop/libgnomeui/Makefile.am
index b7ebe58..f8ef7bd 100644
--- a/libgnome-desktop/libgnomeui/Makefile.am
+++ b/libgnome-desktop/libgnomeui/Makefile.am
@@ -1,10 +1,10 @@
 libgnomeui_desktopdir = $(includedir)/gnome-desktop-3.0/libgnomeui
-libgnomeui_desktop_HEADERS =	\
-	gnome-bg.h		\
-	gnome-bg-crossfade.h	\
-	gnome-desktop-thumbnail.h \
-	gnome-rr.h		\
-	gnome-rr-config.h	\
+libgnomeui_desktop_HEADERS =		\
+	gnome-bg.h			\
+	gnome-bg-crossfade.h		\
+	gnome-desktop-thumbnail.h	\
+	gnome-rr.h			\
+	gnome-rr-config.h		\
 	gnome-rr-labeler.h
 
 -include $(top_srcdir)/git.mk