[gnome-control-center] Fix distcheck

[William Jon McCann <mccann src gnome org>]

commit 074ce4b16f3316e983c940276c2c836175d5bbd8
Author: William Jon McCann <jmccann redhat com>
Date:   Sat Aug 22 11:52:42 2009 -0400

    Fix distcheck

 Makefile.am                   |    1 +
 capplets/Makefile.am          |   19 ++++++++++++++-----
 capplets/about-me/Makefile.am |   17 ++++++++---------
 shell/Makefile.am             |    1 +
 4 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e360dee..0676d55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = po libwindow-settings capplets font-viewer help
+DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break
 
 if HAVE_LIBSLAB_DEPS
 SUBDIRS += libslab shell
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index d88c1d3..728d882 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -1,4 +1,4 @@
-always_built_SUBDIRS = \
+SUBDIRS = \
 	common			\
 	accessibility	\
 	appearance		\
@@ -9,7 +9,19 @@ always_built_SUBDIRS = \
 	network			\
 	windows
 
-SUBDIRS = $(always_built_SUBDIRS)
+DIST_SUBDIRS = \
+	common			\
+	accessibility		\
+	appearance		\
+	default-applications	\
+	keybindings		\
+	keyboard		\
+	mouse			\
+	network			\
+	windows			\
+	display 		\
+	about-me
+
 
 if HAVE_RANDR
 SUBDIRS += display
@@ -19,7 +31,4 @@ if BUILD_ABOUTME
 SUBDIRS += about-me
 endif
 
-DIST_SUBDIRS = \
-	$(always_built_SUBDIRS) display about-me
-
 -include $(top_srcdir)/git.mk
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index ab2d8df..84cbc81 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -20,6 +20,14 @@ gnome_about_me_SOURCES =	 	\
 	fingerprint-strings.h		\
 	gnome-about-me.c
 
+MARSHALFILES = marshal.c marshal.h
+BUILT_SOURCES = $(MARSHALFILES)
+
+marshal.h: fprintd-marshal.list
+	@GLIB_GENMARSHAL@ --prefix=fprintd_marshal $< --header > $@
+marshal.c: fprintd-marshal.list
+	@GLIB_GENMARSHAL@ --prefix=fprintd_marshal $< --body --header > $@
+
 if BUILD_ABOUTME
 bin_PROGRAMS = gnome-about-me
 
@@ -43,15 +51,6 @@ INCLUDES = \
 	-DGNOMECC_PIXMAP_DIR="\"$(pkgdatadir)/pixmaps\"" \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 
-MARSHALFILES = marshal.c marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-marshal.h: $(srcdir)/fprintd-marshal.list
-	( $(GLIB_GENMARSHAL) --prefix=fprintd_marshal $(srcdir)/fprintd-marshal.list --header > marshal.h )
-marshal.c: marshal.h
-	( $(GLIB_GENMARSHAL) --prefix=fprintd_marshal $(srcdir)/fprintd-marshal.list --body --header > marshal.c )
-
-
 endif # BUILD_ABOUTME
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index d55c344..e55715f 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES =					\
+	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libslab			\
 	$(GNOMECC_SHELL_CFLAGS)