dbus/tools Makefile.am,1.12,1.13

[John Palmieri]

Update of /cvs/dbus/dbus/tools
In directory gabe:/tmp/cvs-serv28555/tools

Modified Files:
	Makefile.am 
Log Message:
* tools/Makefile.am: Patch by Colin Walters that fixes distcheck

* dbus/dbus-userdb.c, dbus/dbus-userdb-util.c: Add patch we have 
  had in Red Hat packages for a while but for some reason never 
  got merged upstream
  (_dbus_is_a_number): New checks if a string
  can be converted to a number and does the conversion if it can
  (_dbus_user_database_lookup): Add check to see if the given username
  is a udi.  This allows udi's to be used instead of usernames in the
  config file.
  (_dbus_user_database_lookup_group): Add check to see if the given groupname
  is a gdi.  This allows gdi's to be used instead of groupnames in the
  config file.



Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/tools/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	17 Mar 2005 17:48:29 -0000	1.12
+++ Makefile.am	22 Mar 2005 17:57:27 -0000	1.13
@@ -3,13 +3,13 @@
 if HAVE_GLIB
 GLIB_TOOLS=dbus-monitor
 
-libdbus_glib_HEADERS = dbus-glib-bindings.h
+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)/glib/dbus-binding-tool
 	$(top_builddir)/glib/dbus-binding-tool --ignore-unsupported --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml # FIXME - remove --ignore-unsupported when we can do arrays
 
-BUILT_SOURCES = dbus-glib-bindings.h
+BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
 
 else
 GLIB_TOOLS=
@@ -26,9 +26,7 @@
 print_introspect_SOURCES = print-introspect.c
 print_introspect_LDADD = $(top_builddir)/glib/libdbus-glib-1.la
 
-run-with-tmp-session-bus.sh: $(top_builddir)/bus/dbus-daemon dbus-launch
-
-dbus-bus-introspect.xml: $(srcdir)/run-with-tmp-session-bus.sh print-introspect $(top_builddir)/bus/dbus-daemon
+dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon dbus-launch print-introspect $(top_builddir)/bus/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
 
 bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
@@ -63,5 +61,7 @@
 
 man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
 EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
-
-
+CLEANFILES = 				\
+	run-with-tmp-session-bus.conf	\
+	dbus-bus-introspect.xml		\
+	dbus-glib-bindings.h