From 4033af12367db357307eefcd5c9ff5192660f723 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 28 May 2005 10:54:32 +0000 Subject: fix wlcompat build git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1087 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/package/wlcompat/Makefile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'target/linux/package/wlcompat/Makefile') diff --git a/target/linux/package/wlcompat/Makefile b/target/linux/package/wlcompat/Makefile index 30cb9f471..777a73164 100644 --- a/target/linux/package/wlcompat/Makefile +++ b/target/linux/package/wlcompat/Makefile @@ -8,15 +8,21 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk -ifeq ($(patsubst 2.4%,2.4,$(LINUX_VERSION)),2.4) -$(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(KERNEL_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(LINUX_VERSION)-$(PKG_RELEASE),$(ARCH))) + +ifeq ($(KERNEL_DIR),) +KERNEL_DIR:=$(LINUX_DIR) endif -WLCOMPAT_FLAGS:=$(TARGET_CLFAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \ +WLCOMPAT_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 -DMODULE -mlong-calls -fno-common -I. -I linux-2.4 -funsigned-char -nostdinc \ - -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -I./include -c - + -iwithprefix include -I$(KERNEL_DIR)/include -I$(KERNEL_DIR)/include/asm/gcc -I$(TOPDIR)/package/openwrt/include -c + +$(PKG_BUILD_DIR)/.prepared: + mkdir -p $(PKG_BUILD_DIR) + touch $@ + $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o touch $@ @@ -27,8 +33,8 @@ $(PKG_BUILD_DIR)/wlcompat-debug.o: $(TARGET_CC) -DDEBUG $(WLCOMPAT_FLAGS) -o $@ wlcompat.c $(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o - mkdir -p $(IDIR_WLCOMPAT)/etc/modules.d - echo "wlcompat" > $(IDIR_WLCOMPAT)/etc/modules.d/10-wlcompat - mkdir -p $(IDIR_WLCOMPAT)/lib/modules/$(LINUX_VERSION) - cp $^ $(IDIR_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ - $(IPKG_BUILD) $(IDIR_WLCOMPAT) $(PACKAGE_DIR) + mkdir -p $(IDIR_KMOD_WLCOMPAT)/etc/modules.d + echo "wlcompat" > $(IDIR_KMOD_WLCOMPAT)/etc/modules.d/10-wlcompat + mkdir -p $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION) + cp $(PKG_BUILD_DIR)/*.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ + $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT) $(PACKAGE_DIR) -- cgit v1.2.3