summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author12:58:54 Tim Janik <timj@imendio.com>2008-02-07 12:00:34 +0000
committerTim Janik <timj@src.gnome.org>2008-02-07 12:00:34 +0000
commita9287f0cdf53c49163d9128b425e3d29efad3d03 (patch)
tree79ead18a3d1af541804def33d8d2a6882ff6012d
parentda246088a8998d11226197bd5282875d4c22a8e0 (diff)
downloadglib-a9287f0cdf53c49163d9128b425e3d29efad3d03.tar.gz
fixed build order to build gobject after gmodule gthread so gobject tests
2008-02-07 12:58:54 Tim Janik <timj@imendio.com> * Makefile.am: fixed build order to build gobject after gmodule gthread so gobject tests can be threaded. svn path=/trunk/; revision=6480
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 499915df1..2799940ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-07 12:58:54 Tim Janik <timj@imendio.com>
+
+ * Makefile.am: fixed build order to build gobject after gmodule gthread
+ so gobject tests can be threaded.
+
2008-02-07 Ryan Lortie <desrt@desrt.ca>
* glib/gmessages.h (g_error): add for(;;); after the g_log call so
diff --git a/Makefile.am b/Makefile.am
index 57f77d3ee..b2a0a41f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = . m4macros glib gobject gmodule gthread gio tests po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize