dbus/glib Makefile.am,1.16,1.17 .cvsignore,1.7,1.8

[Colin Walters]

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

Modified Files:
	Makefile.am .cvsignore 
Log Message:
2005-03-17  Colin Walters  <walters at verbum.org>

	* bus/print-introspect.c: Move to tools/.
	* bus/run-with-tmp-session-bus.sh: Ditto.
	
	* glib/Makefile.am (dbus-glib-bindings.h): Move
	generation to tools/Makefile.am.

	* test/glib/run-test.sh: Update to handle move
	of run-with-tmp-session-bus.sh.

	* test/glib/test-service-glib.c: Update to handle
	move of dbus-glib-bindings.h.

	* tools/print-introspect.c: Moved here
	from bus/, and ported to GLib bindings.

	* tools/run-with-tmp-session-bus.sh: Moved here
	from bus/.

	* tools/Makefile.am: Generate dbus-glib-bindings.h
	and dbus-bus-introspect.xml here.

	* tools/.cvsignore, glib/.cvsignore, bus/.cvsignore:
	Update.


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/glib/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	12 Mar 2005 20:07:21 -0000	1.16
+++ Makefile.am	17 Mar 2005 17:48:29 -0000	1.17
@@ -2,9 +2,6 @@
 
 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				\
@@ -50,11 +47,6 @@
 
 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 --ignore-unsupported --mode=glib-client --output=dbus-glib-bindings.h $(top_builddir)/bus/dbus-bus-introspect.xml # FIXME - remove --ignore-unsupported when we can do arrays
-
-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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- .cvsignore	12 Mar 2005 16:33:00 -0000	1.7
+++ .cvsignore	17 Mar 2005 17:48:29 -0000	1.8
@@ -6,7 +6,6 @@
 *.la
 dbus-glib-test
 dbus-binding-tool
-dbus-glib-bindings.h
 *.bb
 *.bbg
 *.da