From 063ec9a75d6f70b45a8e51653608a6e40f948b3c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 25 Apr 2012 14:47:01 -0400
Subject: [PATCH] build: Fix 'make dist' regression

Commit f084b603771f78126bc0b07229a1574b76e776bb incorrectly set
DIST_SUBDIRS for the toplevel Makefile.am.  In general actually we
don't need to set it, because modern automake automatically sets
it by looking at conditionals for SUBDIRS.

Tested-by: Rico Tzschichholz <ricotz@t-online.de>

https://bugzilla.gnome.org/show_bug.cgi?id=667806
---
 gio/Makefile.am     | 3 ---
 glib/Makefile.am    | 6 +-----
 gobject/Makefile.am | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/gio/Makefile.am b/gio/Makefile.am
index da7e89bac..de7a08592 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/Makefile.decl
 
 NULL =
 
-DIST_SUBDIRS =
 SUBDIRS = gdbus-2.0/codegen
 
 if OS_UNIX
@@ -328,8 +327,6 @@ endif
 
 if BUILD_MODULAR_TESTS
 SUBDIRS += tests 
-else
-DIST_SUBDIRS += tests
 endif
 
 libgio_2_0_la_SOURCES =		\
diff --git a/glib/Makefile.am b/glib/Makefile.am
index ac232d2c4..65142f203 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -36,15 +36,11 @@ MAYBE_PCRE = pcre
 endif
 
 SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
-DIST_SUBDIRS =
+DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
 if BUILD_MODULAR_TESTS
 SUBDIRS += tests 
-else
-DIST_SUBDIRS += tests
 endif
 
-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
-
 AM_CPPFLAGS = 				\
 	$(glib_INCLUDES) 		\
 	$(pcre_inc) 			\
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 3dc277f35..94fd777b2 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -5,11 +5,8 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = .
-DIST_SUBDIRS =
 if BUILD_MODULAR_TESTS
 SUBDIRS += tests 
-else
-DIST_SUBDIRS += tests
 endif
 
 BUILT_SOURCES=