X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fpackage%2Fmini_fo%2FMakefile;h=f8986b204f51b28a73fd761a5601b8c1daf0b1e3;hb=edb00048a3862c26a07f352b06c327131b6fcc4c;hp=357d09b945c4732168b04916633fdb5089cfdc72;hpb=85c3d0af359fafa1bdc4fdfd0c6ff299491ac1b4;p=openwrt-10.03%2F.git

diff --git a/target/linux/package/mini_fo/Makefile b/target/linux/package/mini_fo/Makefile
index 357d09b94..f8986b204 100644
--- a/target/linux/package/mini_fo/Makefile
+++ b/target/linux/package/mini_fo/Makefile
@@ -1,6 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include ../../rules.mk
 
 PKG_NAME := mini_fo
 PKG_VERSION := 0.6.1-pre1
@@ -17,17 +18,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 ifeq ($(KERNEL_DIR),)
 KERNEL_DIR:=$(LINUX_DIR)
 endif
-ifeq ($(LINUX_VERSION),2.4.30)
-KERNEL_VERSION=2.4
-else
-KERNEL_VERSION=2.6
-endif
-
-KERNEL_FLAGS=-D__KERNEL__ -DMODULE -DFISTGEN -I. -I$(KERNEL_DIR)/include \
- 	-Wno-unused -fno-common -fno-schedule-insns -fno-schedule-insns2 \
-	-fomit-frame-pointer -finline-limit=100000 -mabi=32 -march=mips32 \
-	-Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -DMODULE -mlong-calls \
-	-fno-strict-aliasing -G 0 -mno-abicalls -fno-pic
+KERNEL_VERSION=$(shell echo "$(LINUX_VERSION)" | cut -d. -f1,2)
 
 include $(TOPDIR)/package/rules.mk
 
@@ -37,23 +28,20 @@ $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built: 
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) $(KERNEL_FLAGS)" \
-		CC="$(TARGET_CC)" \
-		LD="$(TARGET_CROSS)ld" \
+		PATH="$(TARGET_PATH)" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		KERNELVERSION="$(KERNEL_VERSION)" \
 		KERNEL_SRC="$(KERNEL_DIR)" \
-		ROOT="$(PKG_INSTALL_DIR)"
+		all
 	touch $@
 
 $(IPKG_KMOD_MINI_FO):
 	install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)
 	install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d
-	cp -fpR $(PKG_BUILD_DIR)/mini_fo.o \
+	cp -fpR $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \
 	 $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/
 	echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo
-	$(RSTRIP_KMOD) $(IDIR_KMOD_MINI_FO)
 	$(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR)