diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-15 11:32:29 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:06:41 +0100 |
| commit | c368b36901b3b37e6208a48dbcae641a6bef51f6 (patch) | |
| tree | 76f64898550ba7818b2838246c67a8ed920f5a7f /tools | |
| parent | f8c131047cf3af5a001119bcf2f3697994fd17d2 (diff) | |
| download | dbus-c368b36901b3b37e6208a48dbcae641a6bef51f6.tar.gz | |
Simplify linking by moving -export-dynamic to AM_LDFLAGS
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 036b7b75..45921741 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,6 +2,9 @@ configdir=$(sysconfdir)/dbus-1 INCLUDES=-I$(top_srcdir) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" +# if assertions are enabled, improve backtraces +AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ + extra_bin_programs= if DBUS_UNIX extra_bin_programs += dbus-cleanup-sockets dbus-uuidgen @@ -37,16 +40,12 @@ dbus_uuidgen_SOURCES= \ dbus-uuidgen.c dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS) -dbus_send_LDFLAGS=@R_DYNAMIC_LDFLAG@ dbus_monitor_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS) -dbus_monitor_LDFLAGS=@R_DYNAMIC_LDFLAG@ dbus_uuidgen_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS) -dbus_uuidgen_LDFLAGS=@R_DYNAMIC_LDFLAG@ dbus_launch_LDADD= $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS) -dbus_launch_LDFLAGS=@R_DYNAMIC_LDFLAG@ EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c CLEANFILES = \ |