diff options
| author | Colin Walters <walters@verbum.org> | 2005-03-12 16:33:01 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-03-12 16:33:01 +0000 |
| commit | 3dea5c183f65c3f924fb442bf606dfeb50f028a4 (patch) | |
| tree | 0ac180fdc5c7766d003863717ef6cbeff8237806 /glib | |
| parent | 3c1d2d65654f92f24d3e5c9c5b88d76a10f72822 (diff) | |
2005-03-11 Colin Walters <walters@verbum.org>
* glib/Makefile.am: Generate dbus-glib-bindings.h and
install it.
* bus/print-introspect.c: New file; prints introspection
data for a given name and object path.
* bus/run-with-tmp-session-bus.sh: New file, refactored
from test/glib/run-test.sh. Creates a temporary session
bus and runs another program.
* test/glib/run-test.sh: Refactor to invoke
run-with-tmp-session-bus.sh.
* bus/driver.c (bus_driver_handle_introspect): Fix to print new
introspection format. Also change to use DBUS_TYPE_x_AS_STRING
macros instead of hardcoding.
* glib/.cvsignore, bus/.cvsignore, test/glib/.cvsignore: Update.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/.cvsignore | 1 | ||||
| -rw-r--r-- | glib/Makefile.am | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/glib/.cvsignore b/glib/.cvsignore index 4e197a9f..e1a6372c 100644 --- a/glib/.cvsignore +++ b/glib/.cvsignore @@ -6,6 +6,7 @@ Makefile.in *.la dbus-glib-test dbus-binding-tool +dbus-glib-bindings.h *.bb *.bbg *.da diff --git a/glib/Makefile.am b/glib/Makefile.am index 6d81e7d1..4cfea7f0 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -2,6 +2,9 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_T lib_LTLIBRARIES=libdbus-glib-1.la +libdbus_glib_HEADERS = dbus-glib-bindings.h +libdbus_glibdir = $(includedir)/dbus-1.0/dbus + libdbus_glib_1_la_SOURCES = \ dbus-glib.c \ dbus-gmain.c \ @@ -47,6 +50,11 @@ dbus_binding_tool_SOURCES = \ dbus_binding_tool_LDADD= -lexpat libdbus-gtool.la +dbus-glib-bindings.h: $(top_builddir)/bus/dbus-bus-introspect.xml dbus-binding-tool + ./dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h $(top_builddir)/bus/dbus-bus-introspect.xml + +BUILT_SOURCES = dbus-glib-bindings.h + ## we just rebuilt these manually and check them into cvs; easier than ## convincing automake/make to do this properly regenerate-built-sources: |