[Telepathy-commits] [telepathy-mission-control/master] Client code to be used by the ChannelDispatcher

[Alberto Mardegan]

---
 src/Makefile.am |   12 +++++++++++-
 src/client.xml  |   10 ++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)
 create mode 100644 src/client.xml

diff --git a/src/Makefile.am b/src/Makefile.am
index 19dc5fb..4ac504c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,6 +40,7 @@ mission_control_include = \
 
 genincludedir = $(mission_control_includedir)/_gen
 nodist_geninclude_HEADERS = \
+	_gen/cli-client.h \
 	_gen/enums.h \
 	_gen/interfaces.h \
 	_gen/gtypes.h \
@@ -52,6 +53,7 @@ nodist_geninclude_HEADERS = \
 	_gen/svc-Account_Manager_Interface_Query.h
 
 nodist_libmissioncontrol_server_la_SOURCES = \
+	_gen/cli-client-body.h \
 	_gen/gtypes-body.h \
 	_gen/interfaces-body.h \
 	_gen/register-dbus-glib-marshallers-body.h \
@@ -177,7 +179,10 @@ mcd-enum-types.c: Makefile
 mcd-service-gen.h: $(top_builddir)/xml/MissionControl-gen.xml
 	dbus-binding-tool --mode=glib-server --prefix=mcd_service $< > $@
 
-EXTRA_DIST = mcd-signals-marshal.list stamp-mcd-enum-types.h
+EXTRA_DIST = \
+	client.xml \
+	mcd-signals-marshal.list \
+	stamp-mcd-enum-types.h
 
 # ---- telepathy-glib-style code generation ----
 
@@ -244,6 +249,11 @@ _gen/%.xml: $(top_srcdir)/xml/%.xml $(wildcard $(top_srcdir)/xml/*.xml)
 	$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
+_gen/%.xml: %.xml
+	$(mkdir_p) _gen
+	$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
+		$< > $@
+
 _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \
 	$(tools_dir)/glib-client-gen.py Makefile.am
 	$(PYTHON) $(tools_dir)/glib-client-gen.py \
diff --git a/src/client.xml b/src/client.xml
new file mode 100644
index 0000000..93bb711
--- /dev/null
+++ b/src/client.xml
@@ -0,0 +1,10 @@
+<tp:spec
+    xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+    xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<xi:include href="../xml/Client.xml"/>
+<xi:include href="../xml/Client_Approver.xml"/>
+<xi:include href="../xml/Client_Handler.xml"/>
+<xi:include href="../xml/Client_Observer.xml"/>
+
+</tp:spec>
-- 
1.5.6.5