diff options
| author | Colin Walters <walters@verbum.org> | 2010-01-15 12:23:30 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-01-15 12:23:30 -0500 |
| commit | 34636b12c62523b9db789b0fbeb3a86782debf10 (patch) | |
| tree | 85038b46d2f798709f5e3f296f56faeb6f0e66d4 /tools | |
| parent | 9cefa4bae8d20beddf695380af00945790da0206 (diff) | |
Import dbus-bus-introspect.xml upstream
Rather than having consumers pass an externally-generated XML file,
just include one here. In practice our target audience is OS builders,
who if they have the capability to update dbus, also have the capability
to update dbus-glib.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index d6dcbac..943bd71 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -3,22 +3,13 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(D nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h libdbus_glibdir = $(includedir)/dbus-1.0/dbus -dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) - $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml +dbus-glib-bindings.h: $(top_srcdir)/dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) + $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h $(top_srcdir)/dbus-bus-introspect.xml -BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - -if USE_INTROSPECT_XML -dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH) - cp $(INTROSPECT_XML_PATH) dbus-bus-introspect.xml -else -dbus-bus-introspect.xml: - DBUS_TOP_BUILDDIR=$(top_builddir) @DBUS_DAEMONDIR@dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml -endif +BUILT_SOURCES = dbus-glib-bindings.h EXTRA_DIST = run-with-tmp-session-bus.sh session.conf CLEANFILES = \ run-with-tmp-session-bus.conf \ - dbus-bus-introspect.xml \ dbus-glib-bindings.h |