diff options
| author | Ross Burton <ross@openedhand.com> | 2006-06-14 14:39:51 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2006-06-14 14:39:51 +0000 |
| commit | db64de230bfa4894f901ae8c63d947a93dc59139 (patch) | |
| tree | 8d5065b2c0780b4b9ca22d7fa45de6eee7b5e03f /tools/Makefile.am | |
| parent | c07a6249e21947f3831e1d8a98cedb17364e10c5 (diff) | |
2006-06-14 Ross Burton <ross@openedhand.com>
* tools/Makefile.am:
* tools/dbus-monitor.c:
Don't use the GLib bindings in dbus-monitor (patch from Ralf
Habacker).
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 0fdc364d..5cd96c55 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,7 +1,6 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION if HAVE_GLIB -GLIB_TOOLS=dbus-monitor nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h libdbus_glibdir = $(includedir)/dbus-1.0/dbus @@ -11,8 +10,6 @@ dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml -else -GLIB_TOOLS= endif if HAVE_GTK @@ -26,7 +23,7 @@ dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(E DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml endif -bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS) +bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets $(GTK_TOOLS) dbus_send_SOURCES= \ dbus-print-message.c \ @@ -52,7 +49,7 @@ dbus_viewer_SOURCES= \ dbus-viewer.c dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la -dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la +dbus_monitor_LDADD= $(top_builddir)/dbus/libdbus-1.la dbus_launch_LDADD= $(DBUS_X_LIBS) dbus_viewer_LDADD= $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_LIBS) |