[Telepathy-commits] [telepathy-qt4/master] Fix generation of moc in out-of-tree-builds, fixing distcheck

[Simon McVittie]

* Split up the moc Makefile rule because the source might come from the
  srcdir or the builddir, depending
* Ensure that $(builddir)/Client exists before trying to write files
  into it
---
 TelepathyQt4/Makefile.am |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 78d0e71..3dc044f 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -313,5 +313,9 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 		--must-define='IN_TELEPATHY_QT4_HEADER' \
 		$$mainiface
 
-%.moc.hpp: %.h _gen/constants.h _gen/types.h
+Client/%.moc.hpp: $(srcdir)/%.h _gen/constants.h _gen/types.h
+	$(mkdir_p) Client
+	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+
+_gen/%.moc.hpp: %.h _gen/constants.h _gen/types.h
 	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
-- 
1.5.6.5