aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authormatt mooney <mfm@muteddisk.com>2011-05-14 06:55:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-17 16:26:24 -0400
commit7f27b199119980cba63c7968091d090beb6960cf (patch)
tree568fec83f72c47aa0df5de2f63f70d912c5c2796 /drivers/staging
parent0945b4fe3f016900f1f68255e24920b28624a9aa (diff)
staging: usbip: userspace: move manpages to separate directory
Signed-off-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/usbip/userspace/Makefile.am2
-rw-r--r--drivers/staging/usbip/userspace/cmd/Makefile.am2
-rw-r--r--drivers/staging/usbip/userspace/doc/usbip.8 (renamed from drivers/staging/usbip/userspace/cmd/usbip.8)0
-rw-r--r--drivers/staging/usbip/userspace/doc/usbip_bind_driver.8 (renamed from drivers/staging/usbip/userspace/cmd/usbip_bind_driver.8)0
-rw-r--r--drivers/staging/usbip/userspace/doc/usbipd.8 (renamed from drivers/staging/usbip/userspace/cmd/usbipd.8)0
5 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/usbip/userspace/Makefile.am b/drivers/staging/usbip/userspace/Makefile.am
index 964f005a420..c0769526828 100644
--- a/drivers/staging/usbip/userspace/Makefile.am
+++ b/drivers/staging/usbip/userspace/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = lib cmd
2includedir=@includedir@/usbip 2includedir=@includedir@/usbip
3include_HEADERS = lib/usbip.h lib/usbip_common.h lib/vhci_driver.h lib/stub_driver.h 3include_HEADERS = lib/usbip.h lib/usbip_common.h lib/vhci_driver.h lib/stub_driver.h
4 4
5dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
6
5if INSTALL_USBIDS 7if INSTALL_USBIDS
6pkgdata_DATA = usb.ids 8pkgdata_DATA = usb.ids
7EXTRA_DIST = $(pkgdata_DATA) 9EXTRA_DIST = $(pkgdata_DATA)
diff --git a/drivers/staging/usbip/userspace/cmd/Makefile.am b/drivers/staging/usbip/userspace/cmd/Makefile.am
index c923e49a763..5cc50fc71de 100644
--- a/drivers/staging/usbip/userspace/cmd/Makefile.am
+++ b/drivers/staging/usbip/userspace/cmd/Makefile.am
@@ -8,8 +8,6 @@ usbip_bind_driver_SOURCES = bind-driver.c \
8 utils.c utils.h \ 8 utils.c utils.h \
9 usbip_network.h usbip_network.c 9 usbip_network.h usbip_network.c
10 10
11dist_man_MANS = usbip.8 usbipd.8 usbip_bind_driver.8
12
13#usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@ 11#usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@
14#usbip_bind_driver_LDADD = @PACKAGE_LIBS@ 12#usbip_bind_driver_LDADD = @PACKAGE_LIBS@
15 13
diff --git a/drivers/staging/usbip/userspace/cmd/usbip.8 b/drivers/staging/usbip/userspace/doc/usbip.8
index 1653bb2cd7d..1653bb2cd7d 100644
--- a/drivers/staging/usbip/userspace/cmd/usbip.8
+++ b/drivers/staging/usbip/userspace/doc/usbip.8
diff --git a/drivers/staging/usbip/userspace/cmd/usbip_bind_driver.8 b/drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
index 8a8972d5a93..8a8972d5a93 100644
--- a/drivers/staging/usbip/userspace/cmd/usbip_bind_driver.8
+++ b/drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
diff --git a/drivers/staging/usbip/userspace/cmd/usbipd.8 b/drivers/staging/usbip/userspace/doc/usbipd.8
index 3c39520901b..3c39520901b 100644
--- a/drivers/staging/usbip/userspace/cmd/usbipd.8
+++ b/drivers/staging/usbip/userspace/doc/usbipd.8