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>

diff --git a/drivers/staging/usbip/userspace/Makefile.am b/drivers/staging/usbip/userspace/Makefile.am
index c076952..3be3060 100644 (file)
--- 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 6de5bc7..24fd8ae 100644 (file)
--- 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/Makefile.am
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/names.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/names.h
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/stub_driver.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/stub_driver.h
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/usbip.h
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/usbip_common.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/usbip_common.h
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/vhci_driver.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/lib/vhci_driver.h
rename to 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
similarity index 88%
rename from drivers/staging/usbip/userspace/cmd/Makefile.am
rename to drivers/staging/usbip/userspace/src/Makefile.am
index 5cc50fc..3717fc5 100644 (file)
--- 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
similarity index 100%
rename from drivers/staging/usbip/userspace/cmd/bind-driver.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/cmd/usbip.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/cmd/usbip_network.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/cmd/usbip_network.h
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/cmd/usbipd.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/cmd/utils.c
rename to 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
similarity index 100%
rename from drivers/staging/usbip/userspace/cmd/utils.h
rename to drivers/staging/usbip/userspace/src/utils.h