Diff between b58f66f55f7c79f99ccbaa73292bfee9c21b75dc and 7dd1e9c76cf42976b17b9cf4e0c2fff011600b23

Changed Files

File Additions Deletions Status
.gitignore +2 -0 modified
Makefile.am +10 -1 modified
doc/btmon.txt +35 -0 added

Full Patch

diff --git a/.gitignore b/.gitignore
index d661ba9..1a7b417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,8 @@ unit/test-avrcp
 unit/test-*.log
 unit/test-*.trs
 
+doc/btmon.1
+
 android/system-emulator
 android/bluetoothd
 android/mcaptest
diff --git a/Makefile.am b/Makefile.am
index 4588ce8..2f05ceb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -367,10 +367,16 @@ if LIBRARY
 pkgconfig_DATA = lib/bluez.pc
 endif
 
+manual_pages = doc/btmon.1
+
+dist_man_MANS += $(manual_pages)
+
+EXTRA_DIST += $(manual_pages:.1=.txt)
+
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \
 					--disable-systemd --disable-udev
 
-DISTCLEANFILES = $(pkgconfig_DATA)
+DISTCLEANFILES = $(pkgconfig_DATA) $(manual_pages)
 
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
@@ -383,6 +389,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 %.service: %.service.in Makefile
 	$(SED_PROCESS)
 
+%.1: %.txt
+	$(AM_V_GEN)a2x --doctype manpage --format manpage $(srcdir)/$<
+
 src/builtin.h: src/genbuiltin $(builtin_sources)
 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
 
diff --git a/doc/btmon.txt b/doc/btmon.txt
new file mode 100644
index 0000000..7a7fc53
--- /dev/null
+++ b/doc/btmon.txt
@@ -0,0 +1,35 @@
+BTMON(1)
+========
+:doctype: manpage
+
+
+NAME
+----
+btmon - Bluetooth monitor
+
+
+SYNOPSIS
+--------
+*btmon* ['OPTIONS']
+
+
+DESCRIPTION
+-----------
+The btmon(1) command provides access to the Bluetooth subsystem monitor
+infrastructure for reading HCI traces.
+
+
+AUTHOR
+------
+btmon was originally written by Marcel Holtmann.
+
+
+RESOURCES
+---------
+See <http://www.bluez.org/>
+
+
+COPYING
+-------
+Free use of this software is granted under ther terms of the GNU Lesser
+General Public Licenses (LGPL).