dbus/glib Makefile.am,1.27,1.28

Robert McQueen robot101 at freedesktop.org
Sat Oct 29 10:03:00 PDT 2005


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

Modified Files:
	Makefile.am 
Log Message:
2005-10-29  Robert McQueen  <robot101 at debian.org>

        * glib/Makefile.am, glib/examples/Makefile.am,
        glib/examples/statemachine/Makefile.am: Merge patch from Ubuntu by
        Daniel Stone to replace explicit calls to libtool with $(LIBTOOL).

        * test/python/.cvsignore: Add run-with-tmp-session-bus.conf.

        * tools/dbus-monitor.1, tools/dbus-monitor.c: Merge dbus-monitor patch
        from Ubuntu by Daniel Silverstone to allow specifying match rules on
        the command line.


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/glib/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am	6 Sep 2005 22:38:54 -0000	1.27
+++ Makefile.am	29 Oct 2005 17:02:58 -0000	1.28
@@ -5,7 +5,7 @@
 lib_LTLIBRARIES=libdbus-glib-1.la
 
 dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
-	libtool --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
+	$(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
 
 BUILT_SOURCES = dbus-glib-error-switch.h
 



More information about the dbus-commit mailing list