diff options
| author | Colin Walters <walters@verbum.org> | 2005-07-12 17:57:04 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-07-12 17:57:04 +0000 |
| commit | 912f46480c5d395d92588e0e552e11af80394a07 (patch) | |
| tree | 1f49bb81f65f2788bda67eb092bdbe29e6001e1b /glib | |
| parent | 68c7bb8af62f9f0ab1c8acd7c3754cc0bbcd2191 (diff) | |
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.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/Makefile.am | 2 | ||||
| -rw-r--r-- | glib/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | glib/examples/statemachine/Makefile.am | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/glib/Makefile.am b/glib/Makefile.am index 1abf680..2ff47a8 100644 --- 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 7592cac..b929b02 100644 --- 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 11140b1..303808b 100644 --- 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 $@ |