dbus/test/glib Makefile.am,1.7,1.8

[Colin Walters]

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

Modified Files:
	Makefile.am 
Log Message:
2005-02-19  Colin Walters  <walters at verbum.org>

	* glib/dbus-binding-tool-glib.c
	(dbus_binding_tool_output_glib_server): Fix iochannel refcounting.

	* glib/dbus-glib-tool.c: Include dbus-glib-tool.h, as well
	as errno.h and sys/stat.h.
	(lose): New function, prints error with
	newline and exits.
	(lose_gerror): Similar, but takes GError for message.
	(main): Add --output argument to specify output file to write to,
	instead of always printing to stdout.  In this mode, determine
	timestamps on source files to see whether any are newer than the
	target file.  If not, exit.  Also convert a number of error
	messages to use lose (since it's shorter), and switch to using
	g_io_channel_shutdown.


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	17 Feb 2005 17:41:24 -0000	1.7
+++ Makefile.am	19 Feb 2005 23:25:41 -0000	1.8
@@ -40,20 +40,17 @@
 test_dbus_glib_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
 
 test_service_glib_SOURCES=				\
-	test-service-glib.c				\
-	test-service-glib-glue.h
+	test-service-glib.c
 
 BUILT_SOURCES = test-service-glib-glue.h test-service-glib-bindings.h
 
-test-service-glib-glue.h: $(top_builddir)/glib/dbus-binding-tool test-service-glib.xml
-	$(top_builddir)/glib/dbus-binding-tool --mode=glib-server $(srcdir)/test-service-glib.xml > test-service-glib-glue.h.tmp
-	mv test-service-glib-glue.h.tmp test-service-glib-glue.h
+test-service-glib-glue.h: test-service-glib.xml
+	$(top_builddir)/glib/dbus-binding-tool --mode=glib-server --output=test-service-glib-glue.h test-service-glib.xml
 
-test-service-glib-bindings.h: $(top_builddir)/glib/dbus-binding-tool test-service-glib.xml
-	$(top_builddir)/glib/dbus-binding-tool --mode=glib-client $(srcdir)/test-service-glib.xml > test-service-glib-bindings.h.tmp
-	mv test-service-glib-bindings.h.tmp test-service-glib-bindings.h
+test-service-glib-bindings.h: test-service-glib.xml
+	$(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=test-service-glib-bindings.h test-service-glib.xml
 
-CLEANFILES = test-service-glib-glue.h test-service-glib-glue.h.tmp test-service-glib-bindings.h test-service-glib-bindings.h.tmp
+CLEANFILES = test-service-glib-glue.h test-service-glib-bindings.h
 
 test_service_glib_LDADD= $(top_builddir)/glib/libdbus-glib-1.la