diff --git a/Makefile.tools b/Makefile.tools
index 6c381ca..991bdf8 100644
--- a/Makefile.tools
+++ b/Makefile.tools
if MONITOR
bin_PROGRAMS += monitor/btmon
-noinst_PROGRAMS += monitor/btmon emulator/btvirt emulator/b1ee
-
monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
monitor/mainloop.h monitor/mainloop.c \
monitor/display.h monitor/display.c \
monitor/uuid.h monitor/uuid.c \
monitor/sdp.h monitor/sdp.c
monitor_btmon_LDADD = lib/libbluetooth-private.la
+endif
+
+if EXPERIMENTAL
+noinst_PROGRAMS += emulator/btvirt emulator/b1ee
emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
monitor/mainloop.h monitor/mainloop.c \
endif
if TOOLS
-bin_PROGRAMS += tools/rfcomm tools/l2ping tools/l2test tools/rctest \
- tools/hciattach tools/hciconfig \
- tools/hcitool tools/sdptool tools/ciptool \
- tools/bccmd tools/bdaddr
-
-noinst_PROGRAMS += tools/avinfo tools/avtest tools/scotest \
- tools/hcieventmask tools/hcisecfilter \
- tools/btmgmt tools/btattach tools/btsnoop \
- tools/btiotest tools/mpris-player
-
-tools_rfcomm_LDADD = lib/libbluetooth-private.la
-
-tools_l2ping_LDADD = lib/libbluetooth-private.la
-
-tools_l2test_LDADD = lib/libbluetooth-private.la
-
-tools_rctest_LDADD = lib/libbluetooth-private.la
+bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool \
+ tools/rfcomm tools/rctest tools/l2test tools/l2ping \
+ tools/sdptool tools/ciptool tools/bccmd
tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
tools/hciattach_st.c \
tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c
tools_hcitool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @UDEV_LIBS@
+tools_rfcomm_LDADD = lib/libbluetooth-private.la
+
+tools_rctest_LDADD = lib/libbluetooth-private.la
+
+tools_l2test_LDADD = lib/libbluetooth-private.la
+
+tools_l2ping_LDADD = lib/libbluetooth-private.la
+
tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c
tools_sdptool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
tools_ciptool_LDADD = lib/libbluetooth-private.la
+tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
+ tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
+ tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
+tools_bccmd_LDADD = lib/libbluetooth-private.la
+
+if USB
+tools_bccmd_SOURCES += tools/csr_usb.c
+tools_bccmd_LDADD += @USB_LIBS@
+endif
+
+dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 tools/hcitool.1 \
+ tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
+ tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
+else
+EXTRA_DIST += tools/hciattach.1 tools/hciconfig.1 tools/hcitool.1 \
+ tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
+ tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
+endif
+
+if HID2HCI
+udevdir = @UDEV_DIR@
+
+udev_PROGRAMS = tools/hid2hci
+
+tools_hid2hci_LDADD = @USB_LIBS@ @UDEV_LIBS@
+
+dist_man_MANS += tools/hid2hci.1
+else
+EXTRA_DIST += tools/hid2hci.1
+endif
+
+if EXPERIMENTAL
+noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest tools/scotest \
+ tools/hcieventmask tools/hcisecfilter \
+ tools/btmgmt tools/btattach tools/btsnoop \
+ tools/btiotest tools/mpris-player
+
+tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
+tools_bdaddr_LDADD = lib/libbluetooth-private.la @UDEV_LIBS@
+
tools_avinfo_LDADD = lib/libbluetooth-private.la
tools_avtest_LDADD = lib/libbluetooth-private.la
tools_btmgmt_SOURCES = tools/btmgmt.c src/glib-helper.c src/eir.c
tools_btmgmt_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
+tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
+tools_btiotest_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
+
+tools_mpris_player_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+EXTRA_DIST += tools/bdaddr.1
+endif
+
if READLINE
-bin_PROGRAMS += attrib/gatttool
+noinst_PROGRAMS += attrib/gatttool \
+ tools/obex-client-tool tools/obex-server-tool
+
attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
attrib/gattrib.c btio/btio.c \
attrib/gatttool.h attrib/interactive.c \
attrib/utils.c src/log.c
attrib_gatttool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ -lreadline
-noinst_PROGRAMS += tools/obex-client-tool
tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \
tools/obex-client-tool.c
tools_obex_client_tool_LDADD = lib/libbluetooth-private.la \
@GLIB_LIBS@ -lreadline
-noinst_PROGRAMS += tools/obex-server-tool
tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
tools/obex-server-tool.c
tools_obex_server_tool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
endif
-tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
-tools_btiotest_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
-
-tools_mpris_player_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
-
-tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
- tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
- tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
-tools_bccmd_LDADD = lib/libbluetooth-private.la
-
-if USB
-tools_bccmd_SOURCES += tools/csr_usb.c
-tools_bccmd_LDADD += @USB_LIBS@
-endif
-
-tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
-tools_bdaddr_LDADD = lib/libbluetooth-private.la @UDEV_LIBS@
-
-dist_man_MANS += tools/rfcomm.1 tools/l2ping.1 tools/rctest.1 \
- tools/hciattach.1 tools/hciconfig.1 \
- tools/hcitool.1 tools/sdptool.1 tools/ciptool.1 \
- tools/bccmd.1 tools/bdaddr.1
-else
-EXTRA_DIST += tools/rfcomm.1 tools/l2ping.1 tools/rctest.1 \
- tools/hciattach.1 tools/hciconfig.1 \
- tools/hcitool.1 tools/sdptool.1 tools/ciptool.1 \
- tools/bccmd.1 tools/bdaddr.1
-endif
-
-if HID2HCI
-udevdir = @UDEV_DIR@
-
-udev_PROGRAMS = tools/hid2hci
-
-tools_hid2hci_LDADD = @USB_LIBS@ @UDEV_LIBS@
-
-dist_man_MANS += tools/hid2hci.1
-else
-EXTRA_DIST += tools/hid2hci.1
-endif
-
if CUPS
cupsdir = $(libdir)/cups/backend