summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
author15:39:40 Tim Janik <timj@imendio.com>2007-11-22 14:38:26 +0000
committerTim Janik <timj@src.gnome.org>2007-11-22 14:38:26 +0000
commit2dc08ada491c93c4266d599ebfada2e1589f725b (patch)
treeaaea975f1b85e6646eed60fcb0fa091cae48c09a /contrib
parentb5b038af3bbbc544507e18bcb133694c1cd11c98 (diff)
downloadgtk+-2dc08ada491c93c4266d599ebfada2e1589f725b.tar.gz
call g_test_init() from gtk_test_init().
2007-11-22 15:39:40 Tim Janik <timj@imendio.com> * gtk/gtktestutils.c: call g_test_init() from gtk_test_init(). * gtk/tests/testing.c: use g_test_add_func() to register tests and use g_test_run() to run the tests to integrate with the testing framework. * gtk/tests/Makefile.am: removed exemplary testing rules. * Makefile.am, gtk/tests/Makefile.am, gtk/Makefile.am: * gtk/xdgmime/Makefile.am, gtk/theme-bits/Makefile.am: * tests/Makefile.am, docs/reference/gdk-pixbuf/Makefile.am: * docs/reference/gdk/Makefile.am, docs/reference/gtk/Makefile.am: * docs/reference/Makefile.am, docs/tools/Makefile.am: * docs/tutorial/Makefile.am, docs/faq/Makefile.am, docs/Makefile.am: * gdk-pixbuf/pixops/Makefile.am, gdk-pixbuf/Makefile.am: * demos/gtk-demo/Makefile.am, demos/Makefile.am: * modules/input/Makefile.am, modules/printbackends/file/Makefile.am: * modules/printbackends/test/Makefile.am, modules/printbackends/Makefile.am: * modules/printbackends/cups/Makefile.am, modules/printbackends/lpr/Makefile.am: * modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am: * modules/engines/ms-windows/Theme/Makefile.am: * modules/engines/ms-windows/Makefile.am: * modules/engines/Makefile.am, modules/engines/pixbuf/Makefile.am: * modules/Makefile.am, m4macros/Makefile.am, perf/Makefile.am: * contrib/Makefile.am, contrib/gdk-pixbuf-xlib/Makefile.am: * gdk/directfb/Makefile.am, gdk/linux-fb/Makefile.am: * gdk/quartz/Makefile.am, gdk/win32/rc/Makefile.am: * gdk/win32/Makefile.am, gdk/x11/Makefile.am, gdk/Makefile.am: include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments. svn path=/trunk/; revision=19033
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am1
-rw-r--r--contrib/gdk-pixbuf-xlib/Makefile.am4
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 371e5da369..3d2ba11ebc 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_srcdir)/Makefile.decl
SUBDIRS =
if USE_X11
diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index 611a838add..355190e75c 100644
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
@@ -36,4 +38,4 @@ libgdk_pixbuf_xlibinclude_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
-EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in
+EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in