[Telepathy] [PATCH] telepathy-python: fix parallel make issue

Xu, Dongxiao dongxiao.xu at intel.com
Thu Jun 2 20:15:35 PDT 2011


Hi list,

Hope this is the right place to send patches.

While I was integrating telepathy-python into our yocto project "www.yoctoproject.org", I found there was an parallel make issue caused by missing of Makefile dependency.

The following patch fixes this issue. 

Please help to review and pull.

Thanks,
Dongxiao


commit 864e6a75a5ec52489ec4e4558031f3d3a56922ca
Author: Dongxiao Xu <dongxiao.xu at intel.com>
Date:   Fri Jun 3 11:16:43 2011 +0800

    Add dependency of __init__.py
    
    Tasks must be done after exec of __init__, which creates the src/_generated directory that tasks are based on.
    
    Signed-off-by: Dongxiao Xu <dongxiao.xu at intel.com>

diff --git a/src/Makefile.am b/src/Makefile.am index 135f2f0..5c27dfe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,17 +39,17 @@ distclean-local:
 XSLTPROC_OPTS = --nonet --novalid --xinclude  tools_dir = $(top_srcdir)/tools
 
-_generated/interfaces.py: $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
+_generated/interfaces.py: _generated/__init__.py 
+$(tools_dir)/python-interfaces-generator.xsl $(wildcard 
+$(spec_dir)/*.xml)
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
 	    $(tools_dir)/python-interfaces-generator.xsl \
 	    $(spec_dir)/all.xml
 
-_generated/constants.py: $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
+_generated/constants.py: _generated/__init__.py 
+$(tools_dir)/python-constants-generator.xsl $(wildcard 
+$(spec_dir)/*.xml)
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
 	    $(tools_dir)/python-constants-generator.xsl \
 	    $(spec_dir)/all.xml
 
-_generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
+_generated/errors.py: _generated/__init__.py 
+$(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
 	    $(tools_dir)/python-errors-generator.xsl \
 	    $(spec_dir)/all.xml
@@ -58,7 +58,7 @@ _generated/__init__.py:
 	$(AM_V_GEN)$(mkdir_p) $(dir $@)
 	@echo "# Placeholder for package" > $@
 
-_generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
+_generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl 
+$(spec_dir)/%.xml
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
 	    $(tools_dir)/spec-to-python.xsl \
 	    $(spec_dir)/$*.xml


More information about the telepathy mailing list