summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2012-09-10 17:03:25 +0200
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-09-10 17:28:03 +0200
commit29daab56223b7a2bb8c98e389aca85a2b8a0dcfb (patch)
treedae8f98b373c660a56ebc59b322eec2a1c9991df /tools
parent6834819cccb408e6c44931b3cc6321018cbbfb56 (diff)
downloadtelepathy-glib-29daab56223b7a2bb8c98e389aca85a2b8a0dcfb.tar.gz
Do not include single headers in codegen
Headers to use is caller's choice, like that tp-glib internal can use single headers while extensions can use global header. This also move command line headers to generated .h instead of .c
Diffstat (limited to 'tools')
-rw-r--r--tools/glib-ginterface-gen.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index 784397738..6fec0d3c4 100644
--- a/tools/glib-ginterface-gen.py
+++ b/tools/glib-ginterface-gen.py
@@ -738,8 +738,9 @@ class Generator(object):
self.h('#include <glib-object.h>')
self.h('#include <dbus/dbus-glib.h>')
- if self.have_properties(nodes):
- self.h('#include <telepathy-glib/dbus-properties-mixin.h>')
+ for header in self.headers:
+ self.h('#include %s' % header)
+ self.h('')
self.h('')
self.h('G_BEGIN_DECLS')
@@ -747,9 +748,6 @@ class Generator(object):
self.b('#include "%s.h"' % self.basename)
self.b('')
- for header in self.headers:
- self.b('#include %s' % header)
- self.b('')
for node in nodes:
self.do_node(node)