Upgrade to openswan-2.4.6, fix showhostkey script (closes #444), *should* fix #647...

[openwrt.git] / package / diag / Makefile

diff --git a/package/diag/Makefile b/package/diag/Makefile
index d6aa4bf..3ffd2f4 100644 (file)
--- a/package/diag/Makefile
+++ b/package/diag/Makefile
@@ -1,37 +1,49 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME := kmod-diag
-PKG_RELEASE := 1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_NAME:=kmod-diag
+PKG_RELEASE:=1
 
-include $(TOPDIR)/package/rules.mk
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
-DIAG_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \
-               -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 \
-               -Wa,-mips32 -Wa,--trap -Wstrict-prototypes -Wno-trigraphs -DMODULE -mlong-calls -fno-common -I. -I linux-2.4 -nostdinc \
-               -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -c -I$(LINUX_DIR)/arch/mips/bcm947xx/include -DBCMDRIVER
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-diag
- SECTION:=drivers
- CATEGORY:=Drivers
- DEFAULT:=y
- DEPENDS:=@LINUX_2_4_BRCM
- TITLE:=Driver for router LEDs and Buttons
- DESCRIPTION:=Driver for router LEDs and Buttons
- URL:=
- VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
+SECTION:=drivers
+CATEGORY:=Drivers
+DEFAULT:=y
+DEPENDS:=@LINUX_2_4_BRCM
+TITLE:=Driver for router LEDs and Buttons
+DESCRIPTION:=Driver for router LEDs and Buttons
+VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
+
+define Build/Prepare
+       mkdir -p $(PKG_BUILD_DIR)
+       $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
 define Build/Compile
-       $(TARGET_CC) $(DIAG_FLAGS) -o $(PKG_BUILD_DIR)/diag.o diag_led.c
+       $(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" \
+               modules
 endef
        
 define Package/kmod-diag/install
        install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/diag.o $(1)/lib/modules/$(LINUX_VERSION)/
+       $(CP) $(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX) \
+               $(1)/lib/modules/$(LINUX_VERSION)/
 endef
 
 $(eval $(call BuildPackage,kmod-diag))