From 806b93c02793e405da9e25fca0813b2775433bd2 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 25 Dec 2005 15:15:32 +0000
Subject: fix switch driver makefiles for 2.4

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2779 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/target/linux/package/switch/Makefile     | 11 +++++------
 openwrt/target/linux/package/switch/src/Makefile | 14 ++------------
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'openwrt/target/linux')

diff --git a/openwrt/target/linux/package/switch/Makefile b/openwrt/target/linux/package/switch/Makefile
index 0d597b1f5d..0db826d64a 100644
--- a/openwrt/target/linux/package/switch/Makefile
+++ b/openwrt/target/linux/package/switch/Makefile
@@ -25,14 +25,13 @@ $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		PATH="$(TARGET_PATH)" \
-		ARCH="$(LINUX_KARCH)" \
+	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		KERNEL_VERSION="$(KERNEL_VERSION)" \
-		KERNEL_DIR="$(KERNEL_DIR)" \
+		ARCH="$(LINUX_KARCH)" \
+		PATH="$(TARGET_PATH)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="-DBCMGPIO2" \
-		all
+		modules
 	touch $@
 	
 $(IPKG_KMOD_SWITCH):
diff --git a/openwrt/target/linux/package/switch/src/Makefile b/openwrt/target/linux/package/switch/src/Makefile
index dd8a426ec2..e4b2b7f38b 100644
--- a/openwrt/target/linux/package/switch/src/Makefile
+++ b/openwrt/target/linux/package/switch/src/Makefile
@@ -10,19 +10,9 @@
 # 2 of the License, or (at your option) any later version.
 #
 
-KERNEL_VERSION = $(shell uname -r | cut -d. -f1,2)
-
 obj-m	:= switch-core.o switch-adm.o switch-robo.o
+export-objs := switch-core.o
 
-ifeq ($(KERNEL_VERSION),2.4)
-
-O_TARGET := $(obj-m)
-
+ifeq ($(MAKING_MODULES),1)
 -include $(TOPDIR)/Rules.make
-
 endif
-
-all: modules
-
-modules:
-	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(shell pwd) TOPDIR="$(KERNEL_DIR)" modules
-- 
cgit v1.2.3