X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fusbip%2FMakefile;h=482a4972b2969b930e0a3a1534f1a1283493f006;hb=72173453a944ec1b47339f71349bd28d2cb0160d;hp=ce88bd97a4a32df0923a8f5ed7a62a834659b013;hpb=bac4123a5fd81126af3f15d5aa713c550f9fe443;p=packages.git

diff --git a/net/usbip/Makefile b/net/usbip/Makefile
index ce88bd97a..482a4972b 100644
--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -24,7 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/usbip/Common
   TITLE:=USB-over-IP
   URL:=http://usbip.sourceforge.net/
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT
+  DEPENDS:=@!LINUX_2_4 @USB_SUPPORT +glib2 +sysfsutils
+  MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 endef
 
 define Package/usbip/Default
@@ -36,19 +37,19 @@ endef
 define Package/usbip
 $(call Package/usbip/Default)
   TITLE+= (common)
-  DEPENDS+= +glib2 +libsysfs +libwrap
+  DEPENDS+= +glib2 +sysfsutils +libwrap +kmod-usbip
 endef
 
 define Package/usbip-client
 $(call Package/usbip/Default)
   TITLE+= (client)
-  DEPENDS+= +usbip +kmod-usbip-client
+  DEPENDS+= usbip +kmod-usbip-client
 endef
 
 define Package/usbip-server
 $(call Package/usbip/Default)
   TITLE+= (server)
-  DEPENDS+= +usbip +kmod-usbip-server
+  DEPENDS+= usbip +kmod-usbip-server
 endef
 
 define KernelPackage/usbip/Default
@@ -59,7 +60,7 @@ endef
 define KernelPackage/usbip
 $(call KernelPackage/usbip/Default)
   TITLE+= (kernel support)
-  KCONFIG:= USB_IP_COMMON=m
+  KCONFIG:= CONFIG_USB_IP_COMMON CONFIG_USB_IP_DEBUG_ENABLE=n
   FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip_common_mod.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,98,usbip_common_mod)
 endef
@@ -68,8 +69,8 @@ define KernelPackage/usbip-client
 $(call KernelPackage/usbip/Default)
   SUBMENU:=USB Support
   TITLE+= (kernel client driver)
-  DEPENDS+= +kmod-usbip
-  KCONFIG:= USB_IP_VHCI_HCD=m
+  DEPENDS+= kmod-usbip
+  KCONFIG:= CONFIG_USB_IP_VHCI_HCD
   FILES:=$(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,99,vhci-hcd)
 endef
@@ -78,8 +79,8 @@ define KernelPackage/usbip-server
 $(call KernelPackage/usbip/Default)
   SUBMENU:=USB Support
   TITLE+= (kernel host driver)
-  DEPENDS+= +kmod-usbip
-  KCONFIG:= USB_IP_HOST=m
+  DEPENDS+= kmod-usbip
+  KCONFIG:= CONFIG_USB_IP_HOST
   FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,99,usbip)
 endef
@@ -90,9 +91,16 @@ CONFIGURE_PATH:=./src
 MAKE_PATH:=./src
 LIBTOOL_PATHS:=./src
 
+CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
+
+TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libintl/lib/
+TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include/
+TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+
 define Build/Prepare
 $(call Build/Prepare/Default)
-	(cd $(PKG_BUILD_DIR)/src; [ -x ./configure ] || ./autogen.sh )
+	(cd $(PKG_BUILD_DIR)/src; autoreconf -v --install || exit 1 )
 endef
 
 define Build/Compile/kmod
@@ -114,10 +122,10 @@ define Package/usbip/install
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/libusbip.so.* \
 		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/share/usbip
+	$(INSTALL_DIR) $(1)/usr/share/hwdata
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/share/usbip/usb.ids \
-		$(1)/usr/share/usbip/
+		$(1)/usr/share/hwdata/
 endef
 
 define Package/usbip-client/install
@@ -130,9 +138,11 @@ endef
 define Package/usbip-server/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/bind_driver \
 		$(PKG_INSTALL_DIR)/usr/bin/usbipd \
 		$(1)/usr/bin/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/bin/bind_driver \
+		$(1)/usr/bin/usbip_bind_driver
 endef
 
 $(eval $(call BuildPackage,usbip))