diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-12-25 15:15:32 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-12-25 15:15:32 +0000 |
| commit | d652f305ac241e90971276bfe460d4939ea32100 (patch) | |
| tree | 5ae38618aacf97617a95272fe4622f0588363592 | |
| parent | 880e31f778b378d13cec730c5b922ce6ba36fff4 (diff) | |
fix switch driver makefiles for 2.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2779 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/package/switch/Makefile | 11 | ||||
| -rw-r--r-- | target/linux/package/switch/src/Makefile | 14 |
2 files changed, 7 insertions, 18 deletions
diff --git a/target/linux/package/switch/Makefile b/target/linux/package/switch/Makefile index 0d597b1f5d..0db826d64a 100644 --- a/target/linux/package/switch/Makefile +++ b/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/target/linux/package/switch/src/Makefile b/target/linux/package/switch/src/Makefile index dd8a426ec2..e4b2b7f38b 100644 --- a/target/linux/package/switch/src/Makefile +++ b/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 |