tools: put bin_PROGRAMS one per line, eliminate unnecessary variable

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 45921741309209a3f9e30c68b2be19197ea6f6f5..6b74d4bb45f7c689ffe974ebf9fe4407d5522476 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,13 +5,19 @@ INCLUDES=-I$(top_srcdir) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/
 # if assertions are enabled, improve backtraces
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
-extra_bin_programs=
+bin_PROGRAMS = \
+       dbus-launch \
+       dbus-monitor \
+       dbus-send \
+       $(NULL)
+
 if DBUS_UNIX
-extra_bin_programs += dbus-cleanup-sockets dbus-uuidgen
+bin_PROGRAMS += \
+       dbus-cleanup-sockets \
+       dbus-uuidgen \
+       $(NULL)
 endif
 
-bin_PROGRAMS=dbus-launch dbus-send dbus-monitor $(extra_bin_programs)
-
 dbus_send_SOURCES=                             \
        dbus-print-message.c                    \
        dbus-print-message.h                    \