[telepathy-glib/master] Move debug codegen to its own "debug" section and only generate svc code.

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 telepathy-glib/Makefile.am           |    4 ++++
 telepathy-glib/debug-sender.c        |    1 +
 telepathy-glib/debug-sender.h        |    2 +-
 telepathy-glib/debug.xml             |    9 +++++++++
 telepathy-glib/generic.xml           |    1 -
 telepathy-glib/stable-interfaces.xml |    2 ++
 telepathy-glib/svc-debug.h           |    6 ++++++
 7 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 telepathy-glib/debug.xml
 create mode 100644 telepathy-glib/svc-debug.h

diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index 9cbc53c..fcd147b 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -49,6 +49,7 @@ EXTRA_DIST = \
     channel-dispatch-operation.xml \
     channel-request.xml \
     client.xml \
+    debug.xml \
     connection.xml \
     connection-manager.xml \
     dbus-daemon.xml \
@@ -175,6 +176,7 @@ our_headers = \
     svc-client.h \
     svc-connection.h \
     svc-connection-manager.h \
+    svc-debug.h \
     svc-generic.h \
     svc-media-interfaces.h \
     svc-properties-interface.h \
@@ -216,6 +218,7 @@ nodist_libtelepathy_glib_internal_la_SOURCES = \
     _gen/tp-svc-client.c \
     _gen/tp-svc-connection.c \
     _gen/tp-svc-connection-manager.c \
+    _gen/tp-svc-debug.c \
     _gen/tp-svc-generic.c \
     _gen/tp-svc-media-session-handler.c \
     _gen/tp-svc-media-stream-handler.c
@@ -247,6 +250,7 @@ nodist_geninclude_HEADERS = \
     _gen/tp-svc-client.h \
     _gen/tp-svc-connection.h \
     _gen/tp-svc-connection-manager.h \
+    _gen/tp-svc-debug.h \
     _gen/tp-svc-generic.h \
     _gen/tp-svc-media-session-handler.h \
     _gen/tp-svc-media-stream-handler.h
diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
index ca48128..c8f5658 100644
--- a/telepathy-glib/debug-sender.c
+++ b/telepathy-glib/debug-sender.c
@@ -24,6 +24,7 @@
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>
+#include <telepathy-glib/svc-generic.h>
 
 /**
  * SECTION:debug-sender
diff --git a/telepathy-glib/debug-sender.h b/telepathy-glib/debug-sender.h
index 419bcaa..b21a27e 100644
--- a/telepathy-glib/debug-sender.h
+++ b/telepathy-glib/debug-sender.h
@@ -24,7 +24,7 @@
 
 #include <telepathy-glib/dbus-properties-mixin.h>
 #include <telepathy-glib/enums.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/svc-debug.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-glib/debug.xml b/telepathy-glib/debug.xml
new file mode 100644
index 0000000..c4312f9
--- /dev/null
+++ b/telepathy-glib/debug.xml
@@ -0,0 +1,9 @@
+<tp:spec
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<tp:title>Debug interfaces</tp:title>
+
+<xi:include href="../spec/Debug.xml"/>
+
+</tp:spec>
diff --git a/telepathy-glib/generic.xml b/telepathy-glib/generic.xml
index 573ee64..5e50972 100644
--- a/telepathy-glib/generic.xml
+++ b/telepathy-glib/generic.xml
@@ -9,6 +9,5 @@
 <xi:include href="dbus-properties.xml"/>
 
 <xi:include href="../spec/Properties_Interface.xml"/>
-<xi:include href="../spec/Debug.xml"/>
 
 </tp:spec>
diff --git a/telepathy-glib/stable-interfaces.xml b/telepathy-glib/stable-interfaces.xml
index 726dbf5..b0111a6 100644
--- a/telepathy-glib/stable-interfaces.xml
+++ b/telepathy-glib/stable-interfaces.xml
@@ -21,6 +21,8 @@
 
 <xi:include href="client.xml"/>
 
+<xi:include href="debug.xml"/>
+
 <xi:include href="../spec/generic-types.xml"/>
 <xi:include href="../spec/errors.xml"/>
 
diff --git a/telepathy-glib/svc-debug.h b/telepathy-glib/svc-debug.h
new file mode 100644
index 0000000..abedc37
--- /dev/null
+++ b/telepathy-glib/svc-debug.h
@@ -0,0 +1,6 @@
+#ifndef __TP_SVC_DEBUG_H__
+#define __TP_SVC_DEBUG_H__
+
+#include <telepathy-glib/_gen/tp-svc-debug.h>
+
+#endif
-- 
1.5.6.5