diff options
| author | 15:39:40 Tim Janik <timj@imendio.com> | 2007-11-22 14:38:26 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2007-11-22 14:38:26 +0000 |
| commit | 2dc08ada491c93c4266d599ebfada2e1589f725b (patch) | |
| tree | aaea975f1b85e6646eed60fcb0fa091cae48c09a | |
| parent | b5b038af3bbbc544507e18bcb133694c1cd11c98 (diff) | |
| download | gtk+-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
44 files changed, 123 insertions, 57 deletions
@@ -1,3 +1,34 @@ +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. + 2007-11-22 Matthias Clasen <mclasen@redhat.com> * modules/printbackends/cups/gtkcupsutils.c: Fix a casting problem. diff --git a/Makefile.am b/Makefile.am index 07ba6289d4..db7db5368e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ ## Makefile.am for GTK+ +include $(top_srcdir)/Makefile.decl SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros @@ -6,7 +7,7 @@ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 AUTOMAKE_OPTIONS = 1.7 -EXTRA_DIST = \ +EXTRA_DIST += \ HACKING \ makecopyright \ NEWS.pre-1-0 \ 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 diff --git a/demos/Makefile.am b/demos/Makefile.am index 7ab6ef0b46..e50284e355 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -1,4 +1,5 @@ ## Makefile.am for gtk+/demos +include $(top_srcdir)/Makefile.decl SUBDIRS = gtk-demo @@ -70,7 +71,7 @@ testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c testanimation_SOURCES = testanimation.c pixbuf-init.c pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c -EXTRA_DIST = \ +EXTRA_DIST += \ apple-red.png \ background.jpg \ gnome-applets.png \ diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index ccd941a0b8..964f8130bc 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -1,4 +1,5 @@ ## Makefile.am for gtk+/demos +include $(top_srcdir)/Makefile.decl democodedir=$(datadir)/gtk-2.0/demo @@ -60,7 +61,7 @@ bin_PROGRAMS = gtk-demo BUILT_SOURCES = demos.h -EXTRA_DIST = \ +EXTRA_DIST += \ $(IMAGEFILES) \ demo.ui diff --git a/docs/Makefile.am b/docs/Makefile.am index 21beb463f9..47f80304cd 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,8 +1,9 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/Makefile.decl SUBDIRS = tutorial faq reference tools -EXTRA_DIST = \ +EXTRA_DIST += \ defsformat.txt \ developers.txt \ dnd_internals.txt \ diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am index a774a8c58e..5aebcd2b45 100644 --- a/docs/faq/Makefile.am +++ b/docs/faq/Makefile.am @@ -1,4 +1,6 @@ -EXTRA_DIST = \ +include $(top_srcdir)/Makefile.decl + +EXTRA_DIST += \ gtk-faq.sgml if HAVE_DOCBOOK diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 26da15420d..1748f8372b 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/Makefile.decl SUBDIRS = gdk-pixbuf gdk gtk diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index 6660a0f9c1..f8cda83e61 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/Makefile.decl AUTOMAKE_OPTIONS = 1.6 diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index ccbfffcee5..f18625f34d 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -1,4 +1,5 @@ ## 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 f123be2f68..fca0a7a639 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/Makefile.decl AUTOMAKE_OPTIONS = 1.6 diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am index a38b96ab40..8a555ba0b2 100644 --- a/docs/tools/Makefile.am +++ b/docs/tools/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am index d5b46a1b54..43e6c24413 100644 --- a/docs/tutorial/Makefile.am +++ b/docs/tutorial/Makefile.am @@ -1,6 +1,8 @@ +include $(top_srcdir)/Makefile.decl + .PHONY: html pdf -EXTRA_DIST = \ +EXTRA_DIST += \ gtk-tut.sgml \ images/arrow.png \ images/aspectframe.png \ diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 4fb5e0b07f..4e7d780de4 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -1,3 +1,4 @@ +include $(top_srcdir)/Makefile.decl SUBDIRS = pixops @@ -482,7 +483,7 @@ distclean-local: rm -f $(MAINTAINERCLEANFILES); \ fi -EXTRA_DIST = \ +EXTRA_DIST += \ gdk-pixbuf-csource.1 \ makefile.msc \ gdk-pixbuf.symbols \ diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am index 9face994f9..af163f3dc1 100644 --- a/gdk-pixbuf/pixops/Makefile.am +++ b/gdk-pixbuf/pixops/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + noinst_LTLIBRARIES = libpixops.la INCLUDES = \ @@ -25,7 +27,7 @@ libpixops_la_SOURCES = \ pixops-internal.h \ $(mmx_sources) -EXTRA_DIST = \ +EXTRA_DIST += \ DETAILS \ pixbuf-transform-math.ltx \ makefile.msc diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 5c5f97daad..8bdd79a4e5 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,9 +1,10 @@ ## Makefile.am for gtk+/gdk +include $(top_srcdir)/Makefile.decl SUBDIRS = $(gdktarget) DIST_SUBDIRS = win32 x11 quartz directfb -EXTRA_DIST = \ +EXTRA_DIST += \ keynames.txt \ keyname-table.h \ gen-keyname-table.pl \ diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am index 3c2ec45027..9a01aaa0d7 100644 --- a/gdk/directfb/Makefile.am +++ b/gdk/directfb/Makefile.am @@ -1,4 +1,5 @@ ## Makefile.am for gtk+/gdk/gdk-directfb +include $(top_srcdir)/Makefile.decl libgdkincludedir = $(includedir)/gtk-2.0/gdk @@ -52,4 +53,4 @@ libgdkinclude_HEADERS = \ gdkprivate-directfb.h -EXTRA_DIST = AUTHORS README TODO +EXTRA_DIST += AUTHORS README TODO diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am index c3a2ca45f7..3a019a9a15 100644 --- a/gdk/linux-fb/Makefile.am +++ b/gdk/linux-fb/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/Makefile.decl bin_PROGRAMS = @@ -80,4 +81,4 @@ gdkfbmanager_LDFLAGS = $(GLIB_LIBS) gdkfbswitch_sources = gdkfbswitch.c gdkfbswitch_LDFLAGS = $(GLIB_LIBS) -EXTRA_DIST=x-cursors.xbm +EXTRA_DIST += x-cursors.xbm diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am index c56203eb1b..6643d2b0eb 100644 --- a/gdk/quartz/Makefile.am +++ b/gdk/quartz/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + libgdkincludedir = $(includedir)/gtk-2.0/gdk INCLUDES = \ diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index bf29c72455..1432182693 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/Makefile.decl libgdkincludedir = $(includedir)/gtk-2.0/gdk @@ -19,7 +20,7 @@ noinst_LTLIBRARIES = libgdk-win32.la SUBDIRS=rc -EXTRA_DIST = \ +EXTRA_DIST += \ bdfcursor.c \ makefile.msc diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am index bf74f3d90a..4253b5a523 100644 --- a/gdk/win32/rc/Makefile.am +++ b/gdk/win32/rc/Makefile.am @@ -1,4 +1,6 @@ -EXTRA_DIST = \ +include $(top_srcdir)/Makefile.decl + +EXTRA_DIST += \ gdk.rc \ gdk.rc.in \ gtk.ico diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 4ba5007a49..11b284bd18 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/Makefile.decl libgdkincludedir = $(includedir)/gtk-2.0/gdk @@ -76,7 +77,7 @@ TESTS = checksettings # We need to include all these C files here since the conditionals # don't seem to be correctly expanded for the dist files. -EXTRA_DIST = \ +EXTRA_DIST += \ gdkinput-x11.c \ gdkinput-xfree.c \ gdkinput-none.c \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 44172157d2..79e2327320 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,4 +1,5 @@ # Makefile.am for gtk+/gtk +include $(top_srcdir)/Makefile.decl SUBDIRS = theme-bits . tests @@ -746,7 +747,7 @@ gtk_extra_sources = \ # MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) EXTRA_HEADERS = -EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources) +EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources) EXTRA_DIST += $(gtk_built_sources) EXTRA_DIST += $(STOCK_ICONS) diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c index 1dc4e37854..001a6a8e78 100644 --- a/gtk/gtktestutils.c +++ b/gtk/gtktestutils.c @@ -50,6 +50,7 @@ gtk_test_init (int *argcp, char ***argvp, ...) { + g_test_init (argcp, argvp, NULL); /* - enter C locale * - call g_test_init(); * - call gtk_init(); diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am index 1db22bc73a..9467e8a5bb 100644 --- a/gtk/tests/Makefile.am +++ b/gtk/tests/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ @@ -16,37 +18,9 @@ progs_ldadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) \ $(top_builddir)/gtk/$(gtktargetlib) -GTESTER = gtester - -TEST_PROGS = noinst_PROGRAMS = $(TEST_PROGS) TEST_PROGS += testing testing_SOURCES = testing.c testing_LDADD = $(progs_ldadd) - - - - - -# Xvfb based test rules -XVFB = Xvfb -test-xvfb: - ${XVFB} -help 2>/dev/null 1>&2 \ - && XID=`for id in \`seq 101 199\` ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ - && { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ - trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ - || { echo Failed to start Xvfb environment for testing; false; } \ - && set -e ; for prg in ${TEST_PROGS} ; do DISPLAY=:$$XID ./$$prg ; done - -# exemplary unit test rules -test: - set -e ; for prg in ${TEST_PROGS} ; do ./$$prg ; done -######### ${GTESTER} --verbose ${TEST_PROGS} -test-report: - $(MAKE) test -######### ${GTESTER} --verbose -k -o testreport.xml ${TEST_PROGS} -.PHONY: test test-report -check-local: test - diff --git a/gtk/tests/testing.c b/gtk/tests/testing.c index 9b56ea03a2..22cb861726 100644 --- a/gtk/tests/testing.c +++ b/gtk/tests/testing.c @@ -222,11 +222,11 @@ main (int argc, { gtk_test_init (&argc, &argv); gtk_test_register_all_types(); - test_text_access(); - test_button_clicks(); - test_button_keys(); - test_slider_ranges(); - test_xserver_sync(); - test_spin_button_arrows(); - return 0; + g_test_add_func ("/ui-tests/text-access", test_text_access); + g_test_add_func ("/ui-tests/button-clicks", test_button_clicks); + g_test_add_func ("/ui-tests/keys-events", test_button_keys); + g_test_add_func ("/ui-tests/slider-ranges", test_slider_ranges); + g_test_add_func ("/ui-tests/xserver-sync", test_xserver_sync); + g_test_add_func ("/ui-tests/spin-button-arrows", test_spin_button_arrows); + return g_test_run(); } diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am index 49a3c39a80..fad97cc368 100644 --- a/gtk/theme-bits/Makefile.am +++ b/gtk/theme-bits/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ $(GDK_PIXBUF_DEP_CFLAGS) @@ -7,4 +9,4 @@ noinst_PROGRAMS = decompose-bits decompose_bits_SOURCES = decompose-bits.c decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png +EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png diff --git a/gtk/xdgmime/Makefile.am b/gtk/xdgmime/Makefile.am index 9a46f12f8f..c153a12d36 100644 --- a/gtk/xdgmime/Makefile.am +++ b/gtk/xdgmime/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + INCLUDES = -DXDG_PREFIX=_gtk_xdg noinst_LTLIBRARIES = libxdgmime.la diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am index 9d96a58252..ad797d84cb 100644 --- a/m4macros/Makefile.am +++ b/m4macros/Makefile.am @@ -1,7 +1,8 @@ +include $(top_srcdir)/Makefile.decl installed_m4= gtk-2.0.m4 -EXTRA_DIST=$(installed_m4) +EXTRA_DIST += $(installed_m4) m4datadir = $(datadir)/aclocal m4data_DATA = $(installed_m4) diff --git a/modules/Makefile.am b/modules/Makefile.am index 41dfbb4470..d8e0c58290 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + if OS_UNIX PRINTBACKENDS_SUBDIR=printbackends endif diff --git a/modules/engines/Makefile.am b/modules/engines/Makefile.am index 8eff8c9308..eb8a899e75 100644 --- a/modules/engines/Makefile.am +++ b/modules/engines/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + if USE_WIN32 wimp = ms-windows endif diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am index bd7a806dc4..3c9ef26ca1 100644 --- a/modules/engines/ms-windows/Makefile.am +++ b/modules/engines/ms-windows/Makefile.am @@ -1,6 +1,8 @@ +include $(top_srcdir)/Makefile.decl + SUBDIRS=Theme -EXTRA_DIST=Makefile.msc +EXTRA_DIST += Makefile.msc INCLUDES = \ -I$(top_srcdir) \ diff --git a/modules/engines/ms-windows/Theme/Makefile.am b/modules/engines/ms-windows/Theme/Makefile.am index 7e652b8ff9..59f4176450 100644 --- a/modules/engines/ms-windows/Theme/Makefile.am +++ b/modules/engines/ms-windows/Theme/Makefile.am @@ -1 +1,3 @@ +include $(top_srcdir)/Makefile.decl + SUBDIRS=gtk-2.0 diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am index 8b690f9936..8957184ee4 100644 --- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am +++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am @@ -1,4 +1,6 @@ +include $(top_srcdir)/Makefile.decl + themedir = $(datadir)/themes/MS-Windows/gtk-2.0 theme_DATA=gtkrc -EXTRA_DIST=$(theme_DATA) +EXTRA_DIST += $(theme_DATA) diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am index 0b2a3cbd96..3f4d45092a 100644 --- a/modules/engines/pixbuf/Makefile.am +++ b/modules/engines/pixbuf/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + if PLATFORM_WIN32 no_undefined = -no-undefined endif diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index c7510046d3..472ed75c20 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -1,4 +1,5 @@ ## Makefile.am for gtk+/modules/input +include $(top_srcdir)/Makefile.decl if PLATFORM_WIN32 no_undefined = -no-undefined diff --git a/modules/printbackends/Makefile.am b/modules/printbackends/Makefile.am index 444a92dc71..5b8981932c 100644 --- a/modules/printbackends/Makefile.am +++ b/modules/printbackends/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + SUBDIRS = file lpr if HAVE_CUPS diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am index 9b179a1e0b..22c0f349f3 100644 --- a/modules/printbackends/cups/Makefile.am +++ b/modules/printbackends/cups/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + if PLATFORM_WIN32 no_undefined = -no-undefined endif diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am index 1afee74ca4..3bc1407e06 100644 --- a/modules/printbackends/file/Makefile.am +++ b/modules/printbackends/file/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + if PLATFORM_WIN32 no_undefined = -no-undefined endif diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am index a207e01fdb..fbe10afb39 100644 --- a/modules/printbackends/lpr/Makefile.am +++ b/modules/printbackends/lpr/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + if PLATFORM_WIN32 no_undefined = -no-undefined endif diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am index e023dc8186..fd0839e826 100644 --- a/modules/printbackends/test/Makefile.am +++ b/modules/printbackends/test/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + if PLATFORM_WIN32 no_undefined = -no-undefined endif diff --git a/perf/Makefile.am b/perf/Makefile.am index d466f6ddf8..3cb7029512 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,4 +1,5 @@ ## Makefile.am for gtk+/perf +include $(top_srcdir)/Makefile.decl INCLUDES = \ -I$(top_srcdir) \ @@ -93,7 +94,7 @@ typebuiltins.c: @REBUILD@ $(headers_with_enums) Makefile && rm -f xgen-gtbc -EXTRA_DIST = \ +EXTRA_DIST += \ README \ marshalers.list \ $(BUILT_SOURCES) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f9bbf0090..d704321417 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,5 @@ ## Makefile.am for gtk+/tests +include $(top_srcdir)/Makefile.decl INCLUDES = \ -I$(top_srcdir) \ @@ -317,7 +318,7 @@ testrecentchoosermenu_SOURCES = \ testvolumebutton_SOURCES = \ testvolumebutton.c -EXTRA_DIST = \ +EXTRA_DIST += \ prop-editor.h \ testgtk.1 \ testgtkrc \ |