From f9b90071e0539a00ae7c727bd6ffa00ab16f1382 Mon Sep 17 00:00:00 2001 From: matt mooney Date: Sat, 14 May 2011 03:55:09 -0700 Subject: [PATCH] staging: usbip: userspace: rename source directories Rename cmd/ to src/ and lib/ to libsrc/. Signed-off-by: matt mooney Signed-off-by: Greg Kroah-Hartman --- drivers/staging/usbip/userspace/Makefile.am | 5 +++-- drivers/staging/usbip/userspace/configure.ac | 2 +- drivers/staging/usbip/userspace/{lib => libsrc}/Makefile.am | 0 drivers/staging/usbip/userspace/{lib => libsrc}/names.c | 0 drivers/staging/usbip/userspace/{lib => libsrc}/names.h | 0 .../staging/usbip/userspace/{lib => libsrc}/stub_driver.c | 0 .../staging/usbip/userspace/{lib => libsrc}/stub_driver.h | 0 drivers/staging/usbip/userspace/{lib => libsrc}/usbip.h | 0 .../staging/usbip/userspace/{lib => libsrc}/usbip_common.c | 0 .../staging/usbip/userspace/{lib => libsrc}/usbip_common.h | 0 .../staging/usbip/userspace/{lib => libsrc}/vhci_driver.c | 0 .../staging/usbip/userspace/{lib => libsrc}/vhci_driver.h | 0 drivers/staging/usbip/userspace/{cmd => src}/Makefile.am | 4 ++-- drivers/staging/usbip/userspace/{cmd => src}/bind-driver.c | 0 drivers/staging/usbip/userspace/{cmd => src}/usbip.c | 0 drivers/staging/usbip/userspace/{cmd => src}/usbip_network.c | 0 drivers/staging/usbip/userspace/{cmd => src}/usbip_network.h | 0 drivers/staging/usbip/userspace/{cmd => src}/usbipd.c | 0 drivers/staging/usbip/userspace/{cmd => src}/utils.c | 0 drivers/staging/usbip/userspace/{cmd => src}/utils.h | 0 20 files changed, 6 insertions(+), 5 deletions(-) rename drivers/staging/usbip/userspace/{lib => libsrc}/Makefile.am (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/names.c (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/names.h (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/stub_driver.c (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/stub_driver.h (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/usbip.h (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/usbip_common.c (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/usbip_common.h (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/vhci_driver.c (100%) rename drivers/staging/usbip/userspace/{lib => libsrc}/vhci_driver.h (100%) rename drivers/staging/usbip/userspace/{cmd => src}/Makefile.am (88%) rename drivers/staging/usbip/userspace/{cmd => src}/bind-driver.c (100%) rename drivers/staging/usbip/userspace/{cmd => src}/usbip.c (100%) rename drivers/staging/usbip/userspace/{cmd => src}/usbip_network.c (100%) rename drivers/staging/usbip/userspace/{cmd => src}/usbip_network.h (100%) rename drivers/staging/usbip/userspace/{cmd => src}/usbipd.c (100%) rename drivers/staging/usbip/userspace/{cmd => src}/utils.c (100%) rename drivers/staging/usbip/userspace/{cmd => src}/utils.h (100%) 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 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 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 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 -- 2.34.1