[telepathy-mission-control/master] Move generated introspect XML into a subdirectory

[Simon McVittie]

Reducing clutter in xml/ makes it easier to compare the interfaces with
the versions found in telepathy-spec.
---
 .gitignore                    |    1 -
 libmissioncontrol/Makefile.am |    2 +-
 src/Makefile.am               |    2 +-
 xml/Makefile.am               |    8 +++++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 715c9d3..08cf095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 *~
 *.swp
 *-gen.h
-*-gen.xml
 *-signals-marshal.[hc]
 *-types.[hc]
 *.stamp
diff --git a/libmissioncontrol/Makefile.am b/libmissioncontrol/Makefile.am
index 2d0efe6..a48297b 100644
--- a/libmissioncontrol/Makefile.am
+++ b/libmissioncontrol/Makefile.am
@@ -108,7 +108,7 @@ mission_control_include = \
 	mission-control-signals-marshal.h \
 	mission-control.h
 
-mc-client-lib-gen.h: $(top_builddir)/xml/MissionControl-gen.xml
+mc-client-lib-gen.h: $(top_builddir)/xml/_gen/introspect-MissionControl.xml
 	dbus-binding-tool --prefix=mc-client-lib --mode=glib-client $< > $@
 
 %-marshal.h: %-marshal.list Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d4d867..20f89d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -193,7 +193,7 @@ mcd-enum-types.c: Makefile
 	&& rm -f xgen-getc
 
 
-mcd-service-gen.h: $(top_builddir)/xml/MissionControl-gen.xml
+mcd-service-gen.h: $(top_builddir)/xml/_gen/introspect-MissionControl.xml
 	dbus-binding-tool --mode=glib-server --prefix=mcd_service $< > $@
 
 EXTRA_DIST = \
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 3a78d00..11fc081 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -22,15 +22,17 @@ SPECS = MissionControl.xml \
         Connection_Interface_Contact_Capabilities.xml
 
 
-SPECS_GEN = ${SPECS:.xml=-gen.xml}
+SPECS_GEN = ${SPECS:%.xml=_gen/introspect-%.xml}
 
 all-local: $(SPECS_GEN)
 
-MissionControl-gen.xml: MissionControl.xml $(tools_dir)/spec-to-introspect.xsl
+_gen/introspect-MissionControl.xml: MissionControl.xml $(tools_dir)/spec-to-introspect.xsl
+	$(mkdir_p) _gen
 	$(XSLTPROC) $(XSLTFLAGS) $(tools_dir)/spec-to-introspect.xsl $< \
 		| $(DROP_NAMESPACE) | $(DROP_TPTYPE) > $@
 
-%-gen.xml: %.xml $(tools_dir)/spec-to-introspect.xsl
+_gen/introspect-%.xml: %.xml $(tools_dir)/spec-to-introspect.xsl
+	$(mkdir_p) _gen
 	$(XSLTPROC) $(XSLTFLAGS) $(tools_dir)/spec-to-introspect.xsl $< \
 		| $(DROP_NAMESPACE) > $@
 
-- 
1.5.6.5