aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDebarshi Ray <debarshir@src.gnome.org>2012-12-01 02:29:13 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-09 18:13:14 +0800
commit796b0b439794ca55b7c4114787f80f830ad0e598 (patch)
treec1d8e1d830e541a5eba03e9a3584e921b6601132
parentd95a09bded20a2cccf0847f4663fd075536399ca (diff)
downloadgsoc2013-empathy-796b0b439794ca55b7c4114787f80f830ad0e598.tar
gsoc2013-empathy-796b0b439794ca55b7c4114787f80f830ad0e598.tar.gz
gsoc2013-empathy-796b0b439794ca55b7c4114787f80f830ad0e598.tar.bz2
gsoc2013-empathy-796b0b439794ca55b7c4114787f80f830ad0e598.tar.lz
gsoc2013-empathy-796b0b439794ca55b7c4114787f80f830ad0e598.tar.xz
gsoc2013-empathy-796b0b439794ca55b7c4114787f80f830ad0e598.tar.zst
gsoc2013-empathy-796b0b439794ca55b7c4114787f80f830ad0e598.zip
Make parallel builds work
There is no need to execute glib-ginterface-gen.py twice because it generates both the .c and .h files in one shot. Therefore, merely having one of them (say the .c) depend on the other (say the .h) is enough. Moreover, running it twice breaks parallel builds because one glib-ginterface-gen.py process steps on the other. Based on a suggestion from Ryan Lortie. Fixes: https://bugzilla.gnome.org/688132
-rw-r--r--extensions/Makefile.am12
1 files changed, 11 insertions, 1 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index bc4213309..65f2f5e01 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -108,7 +108,17 @@ _gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \
--tp-proxy-api=0.10.0 \
$< Emp_Cli _gen/cli-misc
-_gen/svc-misc.c _gen/svc-misc.h: _gen/misc.xml \
+# There is no need to execute glib-ginterface-gen.py twice because it
+# generates both the .c and .h files in one shot. Therefore, merely
+# having one of them (say the .c) depend on the other (say the .h) is
+# enough.
+#
+# Moreover, running it twice breaks parallel builds because one
+# glib-ginterface-gen.py process steps on the other.
+
+_gen/svc-misc.c: _gen/svc-misc.h
+
+_gen/svc-misc.h: _gen/misc.xml \
$(tools_dir)/glib-ginterface-gen.py
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
--filename=_gen/svc-misc \