diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-06-03 20:07:34 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-06-03 20:07:34 +0000 |
| commit | 2aab870f593da0b3ec83095e5ded93b900e4b600 (patch) | |
| tree | 32da162e98ca2a4b625f273e34a7d4e799aae4ec /tools | |
| parent | cb44abb7b70aa160045f8a3f45f769360577fa70 (diff) | |
Update autoconf/automake options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 828aa1b3..bc46b3d4 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,14 +15,6 @@ bccmd_programs = bccmd_manfiles = endif -if AVCTRL -avctrl_programs = avctrl -avctrl_manfiles = avctrl.8 -else -avctrl_programs = -avctrl_manfiles = -endif - if HID2HCI hid2hci_programs = hid2hci hid2hci_manfiles = hid2hci.8 @@ -39,19 +31,17 @@ dfutool_programs = dfutool_manfiles = endif -if DFUBABEL -dfubabel_programs = dfubabel -dfubabel_manfiles = dfubabel.1 +if USB +usb_programs = dfubabel avctrl else -dfubabel_programs = -dfubabel_manfiles = +usb_programs = endif sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2hci_programs) bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs) -noinst_PROGRAMS = hcisecfilter ppporc avinfo +noinst_PROGRAMS = hcisecfilter ppporc avinfo $(usb_programs) hciattach_SOURCES = hciattach.c hciattach_st.c hciattach_LDADD = @BLUEZ_LIBS@ @@ -75,7 +65,8 @@ endif ppporc_LDADD = @BLUEZ_LIBS@ if BCCMD -bccmd_SOURCES = bccmd.c csr.h csr.c csr_hci.c csr_bcsp.c csr_h4.c csr_3wire.c ubcsp.h ubcsp.c +bccmd_SOURCES = bccmd.c csr.h csr.c csr_hci.c \ + csr_bcsp.c csr_h4.c csr_3wire.c ubcsp.h ubcsp.c bccmd_LDADD = @BLUEZ_LIBS@ if USB bccmd_SOURCES += csr_usb.c @@ -83,10 +74,6 @@ bccmd_LDADD += @USB_LIBS@ endif endif -if AVCTRL -avctrl_LDADD = @USB_LIBS@ -endif - if HID2HCI hid2hci_LDADD = @USB_LIBS@ endif @@ -96,9 +83,9 @@ dfutool_SOURCES = dfutool.c dfu.h dfu.c dfutool_LDADD = @USB_LIBS@ endif -if DFUBABEL -dfubabel_SOURCES = dfubabel.c +if USB dfubabel_LDADD = @USB_LIBS@ +avctrl_LDADD = @USB_LIBS@ endif AM_CFLAGS = @BLUEZ_CFLAGS@ @USB_CFLAGS@ @@ -107,8 +94,7 @@ INCLUDES = -I$(top_srcdir)/common if MANPAGES man_MANS = hciattach.8 hciconfig.8 $(tools_manfiles) \ - $(bccmd_manfiles) $(avctrl_manfiles) $(hid2hci_manfiles) \ - $(dfutool_manfiles) $(dfubabel_manfiles) + $(bccmd_manfiles) $(hid2hci_manfiles) $(dfutool_manfiles) endif EXTRA_DIST = hciattach.8 hciconfig.8 hcitool.1 l2ping.1 sdptool.1 ciptool.1 \ |