summaryrefslogtreecommitdiff
path: root/m4macros
diff options
context:
space:
mode:
author21:06:47 Tim Janik <timj@imendio.com>2007-11-21 20:09:46 +0000
committerTim Janik <timj@src.gnome.org>2007-11-21 20:09:46 +0000
commit1e55738f31385ddb3bf172ba3590a79cf42782f4 (patch)
tree7fe6d77dc08924cce36731cfc2ed42295cf35df0 /m4macros
parent49568d5f163a661f1d52a25bd450a4c6ca5b3e18 (diff)
initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional
2007-11-21 21:06:47 Tim Janik <timj@imendio.com> * Makefile.decl: initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional appending via += in other makefiles. define recursive test targets: test, test-report, perf-report, full-report, as described here: http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html * Makefile.am: * build/win32/vs8/Makefile.am, build/win32/dirent/Makefile.am: * build/win32/Makefile.am, build/Makefile.am: * docs/Makefile.am, docs/reference/Makefile.am: * docs/reference/glib/Makefile.am, docs/reference/gobject/Makefile.am: * gmodule/Makefile.am, tests/Makefile.am: * tests/refcount/Makefile.am, tests/gobject/Makefile.am: * glib/update-pcre/Makefile.am, glib/libcharset/Makefile.am: * glib/tests/Makefile.am, glib/pcre/Makefile.am: * glib/gnulib/Makefile.am, gobject/Makefile.am, m4macros/Makefile.am: * gthread/Makefile.am, glib/Makefile.am: include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments. * glib/tests/Makefile.am: removed example testing rules. * glib/tests/testing.c: conditionalized performance and slow tests. * glib/gtestutils.h: * glib/gtestutils.c: work around g_test_config_vars not changing its exported value after value assignments, aparently due to symbol aliases. * glib/gtester.c: fixed off-by-one error which produced junk in logs. * configure.in: check for python >= 2.4 and provide $PYTHON for scripts. svn path=/trunk/; revision=5914
Diffstat (limited to 'm4macros')
-rw-r--r--m4macros/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
index bf2fa8f6a..0284b4e77 100644
--- a/m4macros/Makefile.am
+++ b/m4macros/Makefile.am
@@ -1,7 +1,8 @@
+include $(top_srcdir)/Makefile.decl
installed_m4= glib-2.0.m4 glib-gettext.m4
-EXTRA_DIST=$(installed_m4)
+EXTRA_DIST+=$(installed_m4)
m4datadir = $(datadir)/aclocal
m4data_DATA = $(installed_m4)