summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2014-04-01 10:23:38 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2014-04-14 14:30:27 -0400
commitee38610f9b60e5bd88a3284d4c01b7a694e86fc4 (patch)
treede8495d95a14add0742b339e893f3a0cb9b283a9
parent69642a918b6781425c8147266ce8c565bdbdcbdf (diff)
Add gdbus-codegen support
-rw-r--r--.gitignore1
-rw-r--r--docs/reference/telepathy-glib/Makefile.am1
-rw-r--r--telepathy-glib/Makefile.am39
3 files changed, 34 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 52f631a1c..6030ef2f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,6 +131,7 @@ tags
/telepathy-glib-0.*
/telepathy-glib/tmp-introspect*/
+/telepathy-glib/_gdbus
telepathy-glib/version.h
/telepathy-logger/telepathy-logger-1
diff --git a/docs/reference/telepathy-glib/Makefile.am b/docs/reference/telepathy-glib/Makefile.am
index fb15db8fb..011c40c57 100644
--- a/docs/reference/telepathy-glib/Makefile.am
+++ b/docs/reference/telepathy-glib/Makefile.am
@@ -63,6 +63,7 @@ EXTRA_HFILES=
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
IGNORE_HFILES=\
proxy-introspectable.h \
+ _gdbus \
$(NULL)
# Images to copy into HTML directory.
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index a882a0392..578f7be38 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -163,17 +163,13 @@ tpgdbusinclude_HEADERS = \
value-array.h \
$(NULL)
-BUILT_SOURCES = $(codegen_sources)
-
-CLEANFILES = \
- $(BUILT_SOURCES)
-
nodist_tpginclude_HEADERS = \
version.h \
$(NULL)
distclean-local:
rm -rf _gen
+ rm -rf _gdbus
clean-local:
rm -rf tmp-introspect*
@@ -182,7 +178,7 @@ check_c_sources = \
$(tpginclude_HEADERS) \
$(tpgdbusinclude_HEADERS) \
$(libtelepathy_glib_dbus_internal_la_SOURCES) \
- $(libtelepathy_glib_main_internal_la_SOURCES) \
+ $(libtelepathy_glib_main_internal_handwritten_source) \
$(NULL)
include $(top_srcdir)/tools/check-coding-style.mk
@@ -214,7 +210,7 @@ libtelepathy_glib_main_internal_la_LIBADD = \
libtelepathy-glib-1-dbus.la \
$(NULL)
-libtelepathy_glib_main_internal_la_SOURCES = \
+libtelepathy_glib_main_internal_handwritten_source = \
account.c \
account-channel-request.c \
account-channel-request-internal.h \
@@ -346,6 +342,35 @@ libtelepathy_glib_main_internal_la_SOURCES = \
variant-util.c \
variant-util-internal.h
+libtelepathy_glib_main_internal_la_SOURCES = \
+ $(gdbus_codegen) \
+ $(libtelepathy_glib_main_internal_handwritten_source) \
+ $(NULL)
+
+gdbus_codegen = \
+ _gdbus/Connection.c \
+ _gdbus/Connection.h \
+ $(NULL)
+
+_gdbus/%.c: _gdbus/%-stamp
+ @:
+_gdbus/%.h: _gdbus/%-stamp
+ @:
+_gdbus/%-stamp: Makefile ../spec/%.xml
+ $(MKDIR_P) _gdbus
+ gdbus-codegen --interface-prefix im.telepathy.v1. \
+ --generate-c-code _gdbus/$* \
+ --c-namespace _TpGDBus \
+ $(top_srcdir)/spec/$*.xml
+ touch $@
+
+BUILT_SOURCES = \
+ $(codegen_sources) \
+ $(gdbus_codegen)
+
+CLEANFILES = \
+ $(BUILT_SOURCES)
+
libtelepathy_glib_reentrants_la_SOURCES = \
reentrants.c \
reentrants.h