From 4b7a97be0f8250af48c5b9f97cace813bc64c0f8 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 2 Jul 2012 15:37:05 +0200 Subject: Update tools/ copy from telepathy-glib This avoid single include from generated code --- extensions/Makefile.am | 119 ++++++++++++++++++++++++-------------------- extensions/extensions-cli.c | 3 +- extensions/extensions.h | 2 +- 3 files changed, 67 insertions(+), 57 deletions(-) (limited to 'extensions') diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 6c82fbe..e7248eb 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -33,9 +33,6 @@ nodist_libtpl_extensions_convenience_la_SOURCES = \ _gen/gtypes-body.h \ _gen/interfaces-body.h \ _gen/register-dbus-glib-marshallers-body.h \ - _gen/signals-marshal.c \ - _gen/signals-marshal.h \ - _gen/signals-marshal.list \ _gen/svc-misc.c \ $(gen_headers) \ $(NULL) @@ -78,75 +75,89 @@ libtpl_extensions_la_LDFLAGS = \ -version-info "$(TPL_EXT_LT_CURRENT)":"$(TPL_EXT_LT_REVISION)":"$(TPL_EXT_LT_AGE)" endif # ENABLE_PUBLIC_EXTENSIONS -AM_CFLAGS = $(ERROR_CFLAGS) @TPL_CFLAGS@ +AM_CFLAGS = \ + $(ERROR_CFLAGS) \ + @TPL_CFLAGS@ \ + -DTP_DISABLE_SINGLE_INCLUDE \ + $(NULL) # Generated stuff DROP_NAMESPACE = sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec.extensions-v0"@@g' XSLTPROCFLAGS = --nonet --novalid -_gen/all.xml: all.xml $(wildcard *.xml) Makefile.am - @$(mkdir_p) _gen - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ +# Generated files which can be generated for all categories simultaneously -doc/index.html: _gen/all.xml $(tools_dir)/specparser.py $(tools_dir)/doc-generator.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/doc-generator.py all.xml doc/ \ - telepathy-spec org.freedesktop.Telepathy +_gen/all.xml: all.xml $(wildcard *.xml) $(tools_dir)/xincludator.py + $(mkdir_p) _gen + $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ -_gen/misc.xml: misc.xml $(wildcard *.xml) - @$(mkdir_p) _gen - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ +doc/index.html: _gen/all.xml $(tools_dir)/doc-generator.xsl + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ + $(tools_dir)/doc-generator.xsl \ $< > $@ -_gen/svc-misc.c _gen/svc-misc.h: _gen/misc.xml $(tools_dir)/glib-ginterface-gen.py \ - Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ - --filename=_gen/svc-misc --signal-marshal-prefix=_tpl_ext \ - --include='' \ - --include='"_gen/signals-marshal.h"' \ - --allow-unstable \ - --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ - $< Tpl_Svc_ - -_gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml $(tools_dir)/glib-client-gen.py \ - Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ - --group=misc \ - --subclass=TpProxy \ - --subclass-assert=TP_IS_PROXY \ - --iface-quark-prefix=TPL_IFACE_QUARK \ - --tp-proxy-api=0.10.0 \ - $< Tpl_Cli _gen/cli-misc - -_gen/signals-marshal.list: _gen/all.xml \ - $(tools_dir)/glib-signals-marshal-gen.py \ - Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ - -_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_tpl_ext_marshal $< > $@ +# do nothing, output as a side-effect +_gen/gtypes.h: _gen/gtypes-body.h + @: -_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \ - $(GLIB_GENMARSHAL) --body --prefix=_tpl_ext_marshal $< ; } > $@ +_gen/gtypes-body.h: _gen/all.xml \ + $(top_srcdir)/tools/glib-gtypes-generator.py + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ + $< _gen/gtypes Tpl _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \ $(tools_dir)/glib-client-marshaller-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ _tpl_ext > $@ -_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-gen.py \ - Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Tpl $< > $@ +_gen/enums.h: _gen/all.xml \ + $(tools_dir)/c-constants-gen.py + $(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \ + Tpl \ + $< _gen/enums + +# do nothing, output as a side-effect +_gen/interfaces-body.h: _gen/interfaces.h + @: -_gen/interfaces.h _gen/interfaces-body.h: _gen/all.xml \ - $(tools_dir)/glib-interfaces-gen.py \ - Makefile.am +_gen/interfaces.h: _gen/all.xml \ + $(tools_dir)/glib-interfaces-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \ Tpl _gen/interfaces-body.h _gen/interfaces.h $< -_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ - $(tools_dir)/glib-gtypes-generator.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \ - $< _gen/gtypes Tpl +# Generated files which must be generated per "category". Each TpProxy +# subclass you want to use with --subclass will need to have its own category, +# although you can subdivide further if you want. + +_gen/misc.xml: misc.xml $(wildcard *.xml) $(tools_dir)/xincludator.py + $(mkdir_p) _gen + $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ + +# do nothing, output as a side-effect +_gen/cli-misc.h: _gen/cli-misc-body.h + @: + +_gen/cli-misc-body.h: _gen/misc.xml \ + $(tools_dir)/glib-client-gen.py Makefile.am + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ + --group=misc \ + --subclass=TpProxy \ + --subclass-assert=TP_IS_PROXY \ + --iface-quark-prefix=TPL_IFACE_QUARK \ + --tp-proxy-api=0.10.0 \ + $< Tpl_Cli _gen/cli-misc + +# do nothing, output as a side-effect +_gen/svc-misc.h: _gen/svc-misc.c + @: + +_gen/svc-misc.c: _gen/misc.xml \ + $(tools_dir)/glib-ginterface-gen.py + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ + --filename=_gen/svc-misc \ + --signal-marshal-prefix=_tpl_ext \ + --include='' \ + --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ + --allow-unstable \ + $< Tpl_Svc_ diff --git a/extensions/extensions-cli.c b/extensions/extensions-cli.c index 14eff20..7fd5c86 100644 --- a/extensions/extensions-cli.c +++ b/extensions/extensions-cli.c @@ -2,13 +2,12 @@ #include "extensions.h" -#include +#include #include static void _tpl_ext_register_dbus_glib_marshallers (void); /* include auto-generated stubs for client-specific code */ -#include "_gen/signals-marshal.h" #include "_gen/cli-misc-body.h" #include "_gen/register-dbus-glib-marshallers-body.h" diff --git a/extensions/extensions.h b/extensions/extensions.h index 5c47b59..7f2bc3a 100644 --- a/extensions/extensions.h +++ b/extensions/extensions.h @@ -1,7 +1,7 @@ #ifndef _TPL_EXTENSIONS_H #define _TPL_EXTENSIONS_H -#include +#include #include "_gen/enums.h" #include "_gen/cli-misc.h" -- cgit v1.2.1