[telepathy-mission-control/master] libmcclient: copy in all.xml from xml/

[Simon McVittie]

This gives libmcclient control over the exact classes for which code is
generated (keeping the list separate from what src uses). Even when MCD
uses telepathy-glib for all standard interfaces, libmcclient will have to
keep generating code for everything, to stay compatible with itself.
---
 libmcclient/Makefile.am     |   17 +++++++++--------
 libmcclient/libmcclient.xml |   31 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 libmcclient/libmcclient.xml

diff --git a/libmcclient/Makefile.am b/libmcclient/Makefile.am
index 60fef06..b27baa5 100644
--- a/libmcclient/Makefile.am
+++ b/libmcclient/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"mc-client\"
 
 BUILT_SOURCES = \
-	_gen/all.xml \
+	_gen/libmcclient.xml \
 	mc-signals-marshal.c \
 	mc-signals-marshal.h \
 	$(nodist_libmcclient_la_SOURCES) \
@@ -99,6 +99,7 @@ endif
 
 EXTRA_DIST = \
 	$(libmcclient_include_DATA) \
+	libmcclient.xml \
 	account.xml \
 	account-manager.xml \
 	client.xml \
@@ -117,19 +118,19 @@ _gen/%-quark.c _gen/%-quark.h: %-quark.list \
 		--quark-prefix=MC_QUARK \
 		$< $*_quark _gen/$*-quark
 
-_gen/all.xml: $(top_srcdir)/xml/all.xml $(wildcard $(top_srcdir)/xml/*.xml)
+_gen/libmcclient.xml: libmcclient.xml $(wildcard $(top_srcdir)/xml/*.xml)
 	$(mkdir_p) _gen
 	$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
 # Generated files which can be done for all "classes" at once
 
-_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
+_gen/gtypes.h _gen/gtypes-body.h: _gen/libmcclient.xml \
 	$(top_srcdir)/tools/glib-gtypes-generator.py
 	$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
 		$< _gen/gtypes mc
 
-_gen/signals-marshal.list: _gen/all.xml \
+_gen/signals-marshal.list: _gen/libmcclient.xml \
 	$(tools_dir)/glib-signals-marshal-gen.py
 	$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
 
@@ -139,18 +140,18 @@ _gen/signals-marshal.h: _gen/signals-marshal.list
 _gen/signals-marshal.c: _gen/signals-marshal.list
 	$(GLIB_GENMARSHAL) --body --prefix=_mc_ext_marshal $< > $@
 
-_gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
+_gen/register-dbus-glib-marshallers-body.h: _gen/libmcclient.xml \
 	$(tools_dir)/glib-client-marshaller-gen.py
 	$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
 		_mc_ext > $@
 
-_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl
+_gen/enums.h: _gen/libmcclient.xml $(tools_dir)/c-constants-generator.xsl
 	$(XSLTPROC) $(XSLTPROCFLAGS) \
 		--stringparam mixed-case-prefix mc \
 		$(tools_dir)/c-constants-generator.xsl \
 		$< > $@
 
-_gen/interfaces.h: _gen/all.xml \
+_gen/interfaces.h: _gen/libmcclient.xml \
 	$(tools_dir)/glib-interfaces-generator.xsl \
 	$(tools_dir)/c-interfaces-generator.xsl
 	$(XSLTPROC) $(XSLTPROCFLAGS) \
@@ -158,7 +159,7 @@ _gen/interfaces.h: _gen/all.xml \
 		$(tools_dir)/glib-interfaces-generator.xsl \
 		$< > $@
 
-_gen/interfaces-body.h: _gen/all.xml \
+_gen/interfaces-body.h: _gen/libmcclient.xml \
 	$(tools_dir)/glib-interfaces-body-generator.xsl \
 	$(tools_dir)/c-interfaces-generator.xsl
 	$(XSLTPROC) $(XSLTPROCFLAGS) \
diff --git a/libmcclient/libmcclient.xml b/libmcclient/libmcclient.xml
new file mode 100644
index 0000000..f91cfb3
--- /dev/null
+++ b/libmcclient/libmcclient.xml
@@ -0,0 +1,31 @@
+<tp:spec
+    xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+    xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
+
+<xi:include href="../xml/nmc5.xml"/>
+
+<tp:generic-types>
+    <tp:external-type name="Connection_Status" type="u"
+	from="Telepathy specification (Connection)"/>
+    <tp:external-type name="Connection_Status_Reason" type="u"
+	from="Telepathy specification (Connection)"/>
+    <tp:external-type name="Connection_Presence_Type" type="u"
+	from="Telepathy specification (Connection)"/>
+    <tp:external-type name="Connection_Manager_Name" type="s"
+	from="Telepathy specification (ConnectionManager)"/>
+    <tp:external-type name="Contact_Handle" type="u"
+        from="Telepathy specification (Connection)"/>
+    <tp:external-type name="Protocol" type="s"
+	from="Telepathy specification (ConnectionManager)"/>
+    <tp:external-type name="Simple_Presence" type="(uss)"
+	from="Telepathy specification (SimplePresence)"/>
+    <tp:external-type name="Conn_Mgr_Param_Flags" type="u"
+	from="Telepathy specification (ConnectionManager)"/>
+</tp:generic-types>
+
+<xi:include href="../xml/generic-types.xml"/>
+<xi:include href="../xml/telepathy-types.xml"/>
+
+</tp:spec>
-- 
1.5.6.5