staging: usbip: userspace: rename source directories

Rename cmd/ to src/ and lib/ to libsrc/.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

20 files changed, 6 insertions, 5 deletions

diff --git a/drivers/staging/usbip/userspace/Makefile.am b/drivers/staging/usbip/userspace/Makefile.am
index c0769526828b..3be3060a05f1 100644
--- a/drivers/staging/usbip/userspace/Makefile.am
+++ b/drivers/staging/usbip/userspace/Makefile.am
@@ -1,6 +1,7 @@
-SUBDIRS = lib cmd
+SUBDIRS = libsrc src
 includedir=@includedir@/usbip
-include_HEADERS = lib/usbip.h lib/usbip_common.h lib/vhci_driver.h lib/stub_driver.h
+include_HEADERS := $(addprefix libsrc/, \
+		     usbip.h usbip_common.h vhci_driver.h stub_driver.h)
 
 dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
 
diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac
index 6de5bc721f36..24fd8ae430f2 100644
--- a/drivers/staging/usbip/userspace/configure.ac
+++ b/drivers/staging/usbip/userspace/configure.ac
@@ -101,5 +101,5 @@ PKG_CHECK_MODULES(PACKAGE, glib-2.0 >= $GLIB2_REQUIRED)
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
-AC_CONFIG_FILES([Makefile lib/Makefile cmd/Makefile])
+AC_CONFIG_FILES([Makefile libsrc/Makefile src/Makefile])
 AC_OUTPUT
diff --git a/drivers/staging/usbip/userspace/lib/Makefile.am b/drivers/staging/usbip/userspace/libsrc/Makefile.am
index 10b919d11cd6..10b919d11cd6 100644
--- a/drivers/staging/usbip/userspace/lib/Makefile.am
+++ b/drivers/staging/usbip/userspace/libsrc/Makefile.am
diff --git a/drivers/staging/usbip/userspace/lib/names.c b/drivers/staging/usbip/userspace/libsrc/names.c
index b4de18b4bb9c..b4de18b4bb9c 100644
--- a/drivers/staging/usbip/userspace/lib/names.c
+++ b/drivers/staging/usbip/userspace/libsrc/names.c
diff --git a/drivers/staging/usbip/userspace/lib/names.h b/drivers/staging/usbip/userspace/libsrc/names.h
index 3a269fecc02a..3a269fecc02a 100644
--- a/drivers/staging/usbip/userspace/lib/names.h
+++ b/drivers/staging/usbip/userspace/libsrc/names.h
diff --git a/drivers/staging/usbip/userspace/lib/stub_driver.c b/drivers/staging/usbip/userspace/libsrc/stub_driver.c
index bfe67480f4b8..bfe67480f4b8 100644
--- a/drivers/staging/usbip/userspace/lib/stub_driver.c
+++ b/drivers/staging/usbip/userspace/libsrc/stub_driver.c
diff --git a/drivers/staging/usbip/userspace/lib/stub_driver.h b/drivers/staging/usbip/userspace/libsrc/stub_driver.h
index 3107d18de65a..3107d18de65a 100644
--- a/drivers/staging/usbip/userspace/lib/stub_driver.h
+++ b/drivers/staging/usbip/userspace/libsrc/stub_driver.h
diff --git a/drivers/staging/usbip/userspace/lib/usbip.h b/drivers/staging/usbip/userspace/libsrc/usbip.h
index 7cb8e6fef35d..7cb8e6fef35d 100644
--- a/drivers/staging/usbip/userspace/lib/usbip.h
+++ b/drivers/staging/usbip/userspace/libsrc/usbip.h
diff --git a/drivers/staging/usbip/userspace/lib/usbip_common.c b/drivers/staging/usbip/userspace/libsrc/usbip_common.c
index a128a924b27e..a128a924b27e 100644
--- a/drivers/staging/usbip/userspace/lib/usbip_common.c
+++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.c
diff --git a/drivers/staging/usbip/userspace/lib/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
index c254b5481f7c..c254b5481f7c 100644
--- a/drivers/staging/usbip/userspace/lib/usbip_common.h
+++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
diff --git a/drivers/staging/usbip/userspace/lib/vhci_driver.c b/drivers/staging/usbip/userspace/libsrc/vhci_driver.c
index 5e5481013b11..5e5481013b11 100644
--- a/drivers/staging/usbip/userspace/lib/vhci_driver.c
+++ b/drivers/staging/usbip/userspace/libsrc/vhci_driver.c
diff --git a/drivers/staging/usbip/userspace/lib/vhci_driver.h b/drivers/staging/usbip/userspace/libsrc/vhci_driver.h
index cad8ad7586d9..cad8ad7586d9 100644
--- a/drivers/staging/usbip/userspace/lib/vhci_driver.h
+++ b/drivers/staging/usbip/userspace/libsrc/vhci_driver.h
diff --git a/drivers/staging/usbip/userspace/cmd/Makefile.am b/drivers/staging/usbip/userspace/src/Makefile.am
index 5cc50fc71de2..3717fc5f0b21 100644
--- a/drivers/staging/usbip/userspace/cmd/Makefile.am
+++ b/drivers/staging/usbip/userspace/src/Makefile.am
@@ -12,8 +12,8 @@ usbip_bind_driver_SOURCES = bind-driver.c \
 #usbip_bind_driver_LDADD = @PACKAGE_LIBS@
 
 #AM_CPPFLAGS = -I../include -Wall -std=gnu99
-INCLUDES = -I$(top_srcdir)/lib
-LDADD = ../lib/libusbip.la @PACKAGE_LIBS@
+INCLUDES = -I$(top_srcdir)/libsrc
+LDADD = ../libsrc/libusbip.la @PACKAGE_LIBS@
 EXTRA_CFLAGS = @EXTRA_CFLAGS@
 AM_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) @PACKAGE_CFLAGS@ -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
 
diff --git a/drivers/staging/usbip/userspace/cmd/bind-driver.c b/drivers/staging/usbip/userspace/src/bind-driver.c
index 52267513e5fd..52267513e5fd 100644
--- a/drivers/staging/usbip/userspace/cmd/bind-driver.c
+++ b/drivers/staging/usbip/userspace/src/bind-driver.c
diff --git a/drivers/staging/usbip/userspace/cmd/usbip.c b/drivers/staging/usbip/userspace/src/usbip.c
index 8775394f5370..8775394f5370 100644
--- a/drivers/staging/usbip/userspace/cmd/usbip.c
+++ b/drivers/staging/usbip/userspace/src/usbip.c
diff --git a/drivers/staging/usbip/userspace/cmd/usbip_network.c b/drivers/staging/usbip/userspace/src/usbip_network.c
index a3a955ba6b00..a3a955ba6b00 100644
--- a/drivers/staging/usbip/userspace/cmd/usbip_network.c
+++ b/drivers/staging/usbip/userspace/src/usbip_network.c
diff --git a/drivers/staging/usbip/userspace/cmd/usbip_network.h b/drivers/staging/usbip/userspace/src/usbip_network.h
index 804f83d0de2f..804f83d0de2f 100644
--- a/drivers/staging/usbip/userspace/cmd/usbip_network.h
+++ b/drivers/staging/usbip/userspace/src/usbip_network.h
diff --git a/drivers/staging/usbip/userspace/cmd/usbipd.c b/drivers/staging/usbip/userspace/src/usbipd.c
index 441dcdeee03e..441dcdeee03e 100644
--- a/drivers/staging/usbip/userspace/cmd/usbipd.c
+++ b/drivers/staging/usbip/userspace/src/usbipd.c
diff --git a/drivers/staging/usbip/userspace/cmd/utils.c b/drivers/staging/usbip/userspace/src/utils.c
index 403c30ff902e..403c30ff902e 100644
--- a/drivers/staging/usbip/userspace/cmd/utils.c
+++ b/drivers/staging/usbip/userspace/src/utils.c
diff --git a/drivers/staging/usbip/userspace/cmd/utils.h b/drivers/staging/usbip/userspace/src/utils.h
index 6c29ae945212..6c29ae945212 100644
--- a/drivers/staging/usbip/userspace/cmd/utils.h
+++ b/drivers/staging/usbip/userspace/src/utils.h