---

yaml --- r: 249708 b: refs/heads/master c: f9b9007 h: refs/heads/master v: v3
git-mirror · May 17, 2011 · e351da5 · e351da5
1 parent 7c5e2a7
commit e351da5
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f27b199119980cba63c7968091d090beb6960cf
+refs/heads/master: f9b90071e0539a00ae7c727bd6ffa00ab16f1382
diff --git a/trunk/drivers/staging/usbip/userspace/Makefile.am b/trunk/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/trunk/drivers/staging/usbip/userspace/configure.ac b/trunk/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/...s/staging/usbip/userspace/lib/Makefile.am → ...taging/usbip/userspace/libsrc/Makefile.am b/...s/staging/usbip/userspace/lib/Makefile.am → ...taging/usbip/userspace/libsrc/Makefile.am
diff --git a/...ivers/staging/usbip/userspace/lib/names.c → ...rs/staging/usbip/userspace/libsrc/names.c b/...ivers/staging/usbip/userspace/lib/names.c → ...rs/staging/usbip/userspace/libsrc/names.c
diff --git a/...ivers/staging/usbip/userspace/lib/names.h → ...rs/staging/usbip/userspace/libsrc/names.h b/...ivers/staging/usbip/userspace/lib/names.h → ...rs/staging/usbip/userspace/libsrc/names.h
diff --git a/...staging/usbip/userspace/lib/stub_driver.c → ...ging/usbip/userspace/libsrc/stub_driver.c b/...staging/usbip/userspace/lib/stub_driver.c → ...ging/usbip/userspace/libsrc/stub_driver.c
diff --git a/...staging/usbip/userspace/lib/stub_driver.h → ...ging/usbip/userspace/libsrc/stub_driver.h b/...staging/usbip/userspace/lib/stub_driver.h → ...ging/usbip/userspace/libsrc/stub_driver.h
diff --git a/...ivers/staging/usbip/userspace/lib/usbip.h → ...rs/staging/usbip/userspace/libsrc/usbip.h b/...ivers/staging/usbip/userspace/lib/usbip.h → ...rs/staging/usbip/userspace/libsrc/usbip.h
diff --git a/...taging/usbip/userspace/lib/usbip_common.c → ...ing/usbip/userspace/libsrc/usbip_common.c b/...taging/usbip/userspace/lib/usbip_common.c → ...ing/usbip/userspace/libsrc/usbip_common.c
diff --git a/...taging/usbip/userspace/lib/usbip_common.h → ...ing/usbip/userspace/libsrc/usbip_common.h b/...taging/usbip/userspace/lib/usbip_common.h → ...ing/usbip/userspace/libsrc/usbip_common.h
diff --git a/...staging/usbip/userspace/lib/vhci_driver.c → ...ging/usbip/userspace/libsrc/vhci_driver.c b/...staging/usbip/userspace/lib/vhci_driver.c → ...ging/usbip/userspace/libsrc/vhci_driver.c
diff --git a/...staging/usbip/userspace/lib/vhci_driver.h → ...ging/usbip/userspace/libsrc/vhci_driver.h b/...staging/usbip/userspace/lib/vhci_driver.h → ...ging/usbip/userspace/libsrc/vhci_driver.h
diff --git a/...s/staging/usbip/userspace/cmd/Makefile.am → ...s/staging/usbip/userspace/src/Makefile.am b/...s/staging/usbip/userspace/cmd/Makefile.am → ...s/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/...staging/usbip/userspace/cmd/bind-driver.c → ...staging/usbip/userspace/src/bind-driver.c b/...staging/usbip/userspace/cmd/bind-driver.c → ...staging/usbip/userspace/src/bind-driver.c
diff --git a/...ivers/staging/usbip/userspace/cmd/usbip.c → ...ivers/staging/usbip/userspace/src/usbip.c b/...ivers/staging/usbip/userspace/cmd/usbip.c → ...ivers/staging/usbip/userspace/src/usbip.c
diff --git a/...aging/usbip/userspace/cmd/usbip_network.c → ...aging/usbip/userspace/src/usbip_network.c b/...aging/usbip/userspace/cmd/usbip_network.c → ...aging/usbip/userspace/src/usbip_network.c
diff --git a/...aging/usbip/userspace/cmd/usbip_network.h → ...aging/usbip/userspace/src/usbip_network.h b/...aging/usbip/userspace/cmd/usbip_network.h → ...aging/usbip/userspace/src/usbip_network.h
diff --git a/...vers/staging/usbip/userspace/cmd/usbipd.c → ...vers/staging/usbip/userspace/src/usbipd.c b/...vers/staging/usbip/userspace/cmd/usbipd.c → ...vers/staging/usbip/userspace/src/usbipd.c
diff --git a/...ivers/staging/usbip/userspace/cmd/utils.c → ...ivers/staging/usbip/userspace/src/utils.c b/...ivers/staging/usbip/userspace/cmd/utils.c → ...ivers/staging/usbip/userspace/src/utils.c
diff --git a/...ivers/staging/usbip/userspace/cmd/utils.h → ...ivers/staging/usbip/userspace/src/utils.h b/...ivers/staging/usbip/userspace/cmd/utils.h → ...ivers/staging/usbip/userspace/src/utils.h