dbus/bus run-with-tmp-session-bus.sh, 1.1, NONE print-introspect.c, 1.1, NONE Makefile.am, 1.35, 1.36 .cvsignore, 1.7, 1.8

[Colin Walters]

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

Modified Files:
	Makefile.am .cvsignore 
Removed Files:
	run-with-tmp-session-bus.sh print-introspect.c 
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.


--- run-with-tmp-session-bus.sh DELETED ---

--- print-introspect.c DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/bus/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile.am	12 Mar 2005 20:07:21 -0000	1.35
+++ Makefile.am	17 Mar 2005 17:48:29 -0000	1.36
@@ -77,7 +77,7 @@
 
 ## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
 ## even when not doing "make check"
-noinst_PROGRAMS=$(TESTS) print-introspect
+noinst_PROGRAMS=$(TESTS) 
 
 bus_test_SOURCES=				\
 	$(BUS_SOURCES)				\
@@ -85,20 +85,9 @@
 
 bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
 
-print_introspect_SOURCES = print-introspect.c
-print_introspect_LDADD = $(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
-
-run-with-tmp-session-bus.sh: dbus-daemon
-
-all-local: dbus-bus-introspect.xml
-
-dbus-bus-introspect.xml: $(srcdir)/run-with-tmp-session-bus.sh dbus-daemon
-	DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./print-introspect org.freedesktop.DBus /org/freedesktop/DBus > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
-
 ## mop up the gcov files
 clean-local:
 	/bin/rm *.bb *.bbg *.da *.gcov || true
-	/bin/rm -f run-with-tmp-session-bus.conf
 
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus
@@ -136,4 +125,4 @@
 
 #### Extra dist 
 
-EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) $(man_MANS) $(MAN_IN_FILES) run-with-tmp-session-bus.sh
+EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) $(man_MANS) $(MAN_IN_FILES)

Index: .cvsignore
===================================================================
RCS file: /cvs/dbus/dbus/bus/.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
@@ -14,7 +14,4 @@
 messagebus
 session.conf
 system.conf
-run-with-tmp-session-bus.conf
 dbus-daemon.1
-print-introspect
-dbus-bus-introspect.xml