2005-07-12 Colin Walters <walters@verbum.org>

	* glib/examples/statemachine/Makefile.am (statemachine-server-glue.h)
	(statemachine-glue.h):
	* glib/examples/Makefile.am (example-service-glue.h)
	(example-signal-emitter-glue.h):
	* glib/Makefile.am (dbus-glib-error-switch.h):
	Add libtool --mode=execute so we use the built library instead
	of any installed one.

diff --git a/ChangeLog b/ChangeLog
index 965c4623888fd9d67701b0ed63fce14c06a41ee2..97c641788289424e5d832726b50f59222459d67a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-12  Colin Walters  <walters@verbum.org>
+
+       * glib/examples/statemachine/Makefile.am (statemachine-server-glue.h) 
+       (statemachine-glue.h): 
+       * glib/examples/Makefile.am (example-service-glue.h) 
+       (example-signal-emitter-glue.h): 
+       * glib/Makefile.am (dbus-glib-error-switch.h): 
+       Add libtool --mode=execute so we use the built library instead
+       of any installed one.
+
 2005-07-11  Colin Walters  <walters@verbum.org>
 
        * glib/dbus-gvalue.c (struct _DBusGValue): Delete.

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 1abf68057aef39d2a6587d6df840b4ad7589fc3d..2ff47a87633e89601369e61740d2515fb29f20a8 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_T
 lib_LTLIBRARIES=libdbus-glib-1.la
 
 dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
-       $(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
 

diff --git a/glib/examples/Makefile.am b/glib/examples/Makefile.am
index 7592cacc2bb43dc95fc35c349d158b95cdfc74b4..b929b0237168a9f8976aad8f02e282dedd751162 100644 (file)
--- a/glib/examples/Makefile.am
+++ b/glib/examples/Makefile.am
@@ -15,7 +15,7 @@ example_service_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
 BUILT_SOURCES = example-service-glue.h
 
 example-service-glue.h: example-service.xml
-       $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
+       libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
 
 
 ## Makefile.am bits for another client/server pair
@@ -31,6 +31,6 @@ example_signal_emitter_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
 BUILT_SOURCES += example-signal-emitter-glue.h
 
 example-signal-emitter-glue.h: example-signal-emitter.xml
-       $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
+       libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
 
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/glib/examples/statemachine/Makefile.am b/glib/examples/statemachine/Makefile.am
index 11140b1350803e16bd5b400bd2de0d6b8ca4033b..303808b606c260fdb15363c734394c4e4f81d67d 100644 (file)
--- a/glib/examples/statemachine/Makefile.am
+++ b/glib/examples/statemachine/Makefile.am
@@ -19,10 +19,10 @@ statemachine_client_LDADD= $(top_builddir)/glib/libdbus-glib-1.la $(DBUS_GTK_THR
 BUILT_SOURCES = statemachine-server-glue.h statemachine-glue.h
 
 statemachine-server-glue.h: statemachine-server.xml
-       $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
+       libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
 
 statemachine-glue.h: statemachine.xml
-       $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
+       libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
 
 sm-marshal.c: Makefile sm-marshal.list
        @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@