X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6c1015f0d36018d6de092a05e650848c95758655..c3cd9cb9aba90d54aea68970ccaa2cc7a1f5e5df:/package/qc-usb/Makefile?ds=inline

diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index 78e6dc1da..57f63941f 100644
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -13,56 +13,54 @@ PKG_NAME:=qc-usb
 PKG_VERSION:=0.6.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/qc-usb-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/qce-ga
 PKG_MD5SUM:=6f6787e1dda11ca3b936ad434154f426
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
+
+define Package/qc-usb/Default
+  URL:=http://qce-ga.sourceforge.net/
+endef
 
 define Package/qc-usb-utils
+$(call Package/qc-usb/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Utility programs for the qc-usb kernel module
-  DESCRIPTION:=\
-  	Utilities to tweak parameters of your QuickCam Express or \\\
-  	similar webcam. These programs are completely useless without a \\\
-  	qc-usb-modules package.
-  URL:=http://qce-ga.sourceforge.net/
 endef
 
-define KernelPackage/usb-qc
-  TITLE:=Support for USB QuickCam Express webcam
-  DESCRIPTION:=\
-	Kernel support for Logitech's QuickCam Express webcam and \\\
-	other webcams with similar chipsets.
-  SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT @VIDEO_SUPPORT kmod-usb-core +kmod-videodev
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+define Package/qc-usb-utils/description
+ Utilities to tweak parameters of your QuickCam Express or similar webcam. 
+ These programs are completely useless without a qc-usb-modules package.
+endef
+
+define KernelPackage/video-quickcam
+$(call Package/qc-usb/Default)
+  SUBMENU:=Video Support
+  TITLE:=QuickCam Express USB webcam support
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
 
-ifneq ($(CONFIG_PACKAGE_kmod-usb-qc),)
+define KernelPackage/video-quickcam/description
+ Kernel support for Logitech's QuickCam Express webcam and other webcams 
+ with similar chipsets.
+endef
+
+ifneq ($(CONFIG_PACKAGE_kmod-video-quickcam),)
   define Build/Compile/kmod
 	$(MAKE) -C $(LINUX_DIR) \
-		PATH="$(TARGET_PATH)" \
-                KVER="$(LINUX_VERSION)" \
-		KERNELRELEASE="$(LINUX_VERSION)" \
-                KSRC="$(LINUX_DIR)" \
-                SUBDIRS="$(PKG_BUILD_DIR)" \
-                KERNEL_DIR="$(KERNEL_DIR)" \
-                ARCH="$(LINUX_KARCH)" \
-                CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
 		modules
   endef
 endif
 
 define Build/Compile
 	$(call Build/Compile/kmod)
-
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		qcset
@@ -74,4 +72,4 @@ define Package/qc-usb-utils/install
 endef
 
 $(eval $(call BuildPackage,qc-usb-utils))
-$(eval $(call KernelPackage,usb-qc))
+$(eval $(call KernelPackage,video-quickcam))