From 9c002cf2c12daafa041e3ba006a485eda556517e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 3 Jan 2011 10:55:23 -0500
Subject: [PATCH] Silence automake warnings

When commenting out a binary, also comment out the related variables.
Don't include Makefile.decl in gtk-doc Makefile.am's as they disagree
on assigning to EXTRA_DIST.
---
 docs/reference/gdk/Makefile.am          | 1 -
 docs/reference/gtk/Makefile.am          | 1 -
 docs/reference/libgail-util/Makefile.am | 1 -
 gdk/tests/Makefile.am                   | 4 ++--
 gtk/tests/Makefile.am                   | 8 ++++----
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index f8441217c3..6eeffdb0d7 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index f0bd152eb4..9389c0413a 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am
index cfd0f688d0..ee583e1753 100644
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.7
 
diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index e23df12557..5930f4ca33 100644
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -16,8 +16,8 @@ progs_ldadd = \
 	$(NULL)
 
 #TEST_PROGS              += check-gdk-cairo
-check_gdk_cairo_SOURCES  = check-gdk-cairo.c
-check_gdk_cairo_LDADD    = $(progs_ldadd)
+#check_gdk_cairo_SOURCES  = check-gdk-cairo.c
+#check_gdk_cairo_LDADD    = $(progs_ldadd)
 
 TEST_PROGS        += gdk-color
 gdk_color_SOURCES  = gdk-color.c
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 34367ee4db..994d716146 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -57,8 +57,8 @@ floating_LDADD			 = $(progs_ldadd)
 # on a naked X server creates slightly different event
 # sequences than running on a normal desktop
 # TEST_PROGS			+= crossingevents
-crossingevents_SOURCES		 = crossingevents.c
-crossingevents_LDADD		 = $(progs_ldadd)
+#crossingevents_SOURCES		 = crossingevents.c
+#crossingevents_LDADD		 = $(progs_ldadd)
 
 # Should be ported to new API's
 #TEST_PROGS			+= filechooser
@@ -72,9 +72,9 @@ builder_LDFLAGS			 = -export-dynamic
 
 if OS_UNIX
 #TEST_PROGS			+= defaultvalue
+#defaultvalue_SOURCES		 = defaultvalue.c pixbuf-init.c
+#defaultvalue_LDADD 		 = $(progs_ldadd)
 endif
-defaultvalue_SOURCES		 = defaultvalue.c pixbuf-init.c
-defaultvalue_LDADD 		 = $(progs_ldadd)
 
 TEST_PROGS			+= textbuffer
 textbuffer_SOURCES		 = textbuffer.c pixbuf-init.c