From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 6 Jan 2011 06:09:14 +0000 (-0500)
Subject: Move the GtkApplication example to the right place
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=f2cde4cf3b1d0eb930482af0591562d3ebd4035d

Move the GtkApplication example to the right place
---

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f15e35d7d..2d2a49169 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -48,4 +48,4 @@ LDADD = \
 	$(top_builddir)/gtk/libgtk-3.0.la	\
 	$(GTK_DEP_LIBS)
 
-noinst_PROGRAMS = hello-world window-default
+noinst_PROGRAMS = hello-world window-default bloatpad
diff --git a/gtk/tests/gtk-example-application.c b/examples/bloatpad.c
similarity index 100%
rename from gtk/tests/gtk-example-application.c
rename to examples/bloatpad.c
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 90d4adfca..2d68b0994 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -53,7 +53,7 @@
  *
  * <example id="gtkapplication"><title>A simple application</title>
  * <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gtk/tests/gtk-example-application.c">
+ * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/bloatpad.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
  * </programlisting>
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 994d71614..008823cf9 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -18,7 +18,7 @@ progs_ldadd = \
 	$(top_builddir)/gdk/libgdk-3.0.la	\
 	$(GTK_DEP_LIBS)
 
-noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
+noinst_PROGRAMS = $(TEST_PROGS)
 
 
 TEST_PROGS			+= testing
@@ -96,10 +96,6 @@ TEST_PROGS			+= action
 action_SOURCES			 = action.c
 action_LDADD			 = $(progs_ldadd)
 
-SAMPLE_PROGS = gtk-example-application
-gtk_example_application_SOURCES	= gtk-example-application.c
-gtk_example_application_LDADD	= $(progs_ldadd)
-
 TEST_PROGS			+= stylecontext
 stylecontext_SOURCES		 = stylecontext.c
 stylecontext_LDADD		 = $(progs_ldadd)