From 4c3d2abe274dc970d65688137fbd3151d53d3f7c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 19 Feb 2005 23:25:41 +0000 Subject: 2005-02-19 Colin Walters * 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. --- test/glib/Makefile.am | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/glib/Makefile.am b/test/glib/Makefile.am index 0a246252..7c4ee2ab 100644 --- a/test/glib/Makefile.am +++ b/test/glib/Makefile.am @@ -40,20 +40,17 @@ test_dbus_glib_SOURCES= \ 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 -- cgit