dbus/glib Makefile.am,1.14,1.15 .cvsignore,1.6,1.7

[Colin Walters]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv7493/glib

Modified Files:
	Makefile.am .cvsignore 
Log Message:
2005-03-11  Colin Walters  <walters at 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.


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/glib/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	7 Mar 2005 21:10:46 -0000	1.14
+++ Makefile.am	12 Mar 2005 16:33:00 -0000	1.15
@@ -2,6 +2,9 @@
 
 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_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:

Index: .cvsignore
===================================================================
RCS file: /cvs/dbus/dbus/glib/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- .cvsignore	29 Jan 2005 19:52:19 -0000	1.6
+++ .cvsignore	12 Mar 2005 16:33:00 -0000	1.7
@@ -6,6 +6,7 @@
 *.la
 dbus-glib-test
 dbus-binding-tool
+dbus-glib-bindings.h
 *.bb
 *.bbg
 *.da