[packages] asterisk-*: allow headers for multiple versions to co-exist in staging

[openwrt/svn-archive/archive.git] / net / usbip / Makefile

diff --git a/net/usbip/Makefile b/net/usbip/Makefile
index a0c4c0f20ec9574def5e72b3bb64a70931159abd..9251857675849b39c9e07d2a531aac80af44d0b0 100644 (file)
--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -20,11 +20,12 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.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
 
@@ -60,7 +61,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
@@ -70,7 +71,7 @@ $(call KernelPackage/usbip/Default)
   SUBMENU:=USB Support
   TITLE+= (kernel client driver)
   DEPENDS+= kmod-usbip
-  KCONFIG:= USB_IP_VHCI_HCD=m
+  KCONFIG:= CONFIG_USB_IP_VHCI_HCD
   FILES:=$(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,99,vhci-hcd)
 endef
@@ -80,7 +81,7 @@ $(call KernelPackage/usbip/Default)
   SUBMENU:=USB Support
   TITLE+= (kernel host driver)
   DEPENDS+= kmod-usbip
-  KCONFIG:= USB_IP_HOST=m
+  KCONFIG:= CONFIG_USB_IP_HOST
   FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,99,usbip)
 endef
@@ -91,9 +92,11 @@ CONFIGURE_PATH:=./src
 MAKE_PATH:=./src
 LIBTOOL_PATHS:=./src
 
+CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
+
 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