summaryrefslogtreecommitdiffstats
path: root/tools/Makefile.am
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2005-11-06 21:00:58 +0000
committerMarcel Holtmann <marcel@holtmann.org>2005-11-06 21:00:58 +0000
commit50a8cc8a256f3ef56a6144cabd2ae6ee5848e46d (patch)
treee87bce02680dea3e05c51f2c727d91b6805cf726 /tools/Makefile.am
parent9410c612d365b3aabf13da966e6782225068954f (diff)
Update to the new BCCMD interface utility
Diffstat (limited to 'tools/Makefile.am')
-rw-r--r--tools/Makefile.am36
1 files changed, 14 insertions, 22 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 479011ec..238a2df1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,12 @@
+if BCCMD
+bccmd_programs = bccmd
+bccmd_manfiles = bccmd.8
+else
+bccmd_programs =
+bccmd_manfiles =
+endif
+
if AVCTRL
avctrl_programs = avctrl
avctrl_manfiles = avctrl.8
@@ -15,14 +23,6 @@ hid2hci_programs =
hid2hci_manfiles =
endif
-if CSRINIT
-csrinit_programs = csrinit
-csrinit_manfiles = csrinit.8
-else
-csrinit_programs =
-csrinit_manfiles =
-endif
-
if DFUTOOL
dfutool_programs = dfutool
dfutool_manfiles = dfutool.1
@@ -31,11 +31,11 @@ dfutool_programs =
dfutool_manfiles =
endif
-sbin_PROGRAMS = hciattach hciconfig $(avctrl_programs) $(hid2hci_programs) $(csrinit_programs)
+sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2hci_programs)
bin_PROGRAMS = hcitool l2ping sdptool ciptool $(dfutool_programs)
-noinst_PROGRAMS = hcisecfilter ppporc pskey bccmd
+noinst_PROGRAMS = hcisecfilter ppporc
hciconfig_SOURCES = hciconfig.c csr.h csr.c
hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a
@@ -51,11 +51,10 @@ ciptool_LDADD = @BLUEZ_LIBS@
ppporc_LDADD = @BLUEZ_LIBS@
-pskey_SOURCES = pskey.c csr.h csr.c
-pskey_LDADD = @BLUEZ_LIBS@
-
+if BCCMD
bccmd_SOURCES = bccmd.c csr.h csr.c
bccmd_LDADD = @BLUEZ_LIBS@
+endif
if AVCTRL
avctrl_LDADD = @USB_LIBS@
@@ -65,11 +64,6 @@ if HID2HCI
hid2hci_LDADD = @USB_LIBS@
endif
-if CSRINIT
-csrinit_SOURCES = csrinit.c csr.h
-csrinit_LDADD = @USB_LIBS@
-endif
-
if DFUTOOL
dfutool_SOURCES = dfutool.c dfu.h dfu.c
dfutool_LDADD = @USB_LIBS@
@@ -80,10 +74,8 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @USB_CFLAGS@
INCLUDES = -I$(top_srcdir)/common
man_MANS = hciattach.8 hciconfig.8 hcitool.1 l2ping.1 sdptool.1 ciptool.1 \
- $(avctrl_manfiles) $(hid2hci_manfiles) $(csrinit_manfiles) $(dfutool_manfiles)
-
-noinst_MANS = bccmd.8
+ $(bccmd_manfiles) $(avctrl_manfiles) $(hid2hci_manfiles) $(dfutool_manfiles)
-EXTRA_DIST = $(man_MANS) avctrl.8 hid2hci.8 csrinit.8 dfutool.1 bccmd.8 example.psr
+EXTRA_DIST = $(man_MANS) bccmd.8 avctrl.8 hid2hci.8 dfutool.1 example.psr
MAINTAINERCLEANFILES = Makefile.in