merge the control file and the .ipk file targets into one to prevent them from going...

[openwrt.git] / package / broadcom-diag / Makefile

diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile
index edc1026..e8c71c7 100644 (file)
--- a/package/broadcom-diag/Makefile
+++ b/package/broadcom-diag/Makefile
@@ -1,27 +1,22 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-diag
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-diag

-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
+PKG_RELEASE:=4

 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/diag
 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/diag

-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
-  DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM
+  SUBMENU:=Other modules
+  DEPENDS:=@TARGET_brcm_2_4||TARGET_brcm47xx

   TITLE:=Driver for router LEDs and Buttons
   TITLE:=Driver for router LEDs and Buttons

-  VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)

   FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
 endef
 
   FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
 endef
 


@@ -30,13 +25,17 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 

+ifeq ($(BOARD),brcm-2.4)
+       BUILDFLAGS=-DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include -DLINUX_2_4
+endif
+

 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                ARCH="$(LINUX_KARCH)" \
                SUBDIRS="$(PKG_BUILD_DIR)" \
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                ARCH="$(LINUX_KARCH)" \
                SUBDIRS="$(PKG_BUILD_DIR)" \

-               EXTRA_CFLAGS="-DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include" \
+               EXTRA_CFLAGS="$(BUILDFLAGS)" \

                modules
 endef
                modules
 endef

-       
+

 $(eval $(call KernelPackage,diag))
 $(eval $(call KernelPackage,diag))