X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/03af7c57fed086d639c34b799533566971e7b036..e325df1263a6bc33e1801681a5daddb448f0e090:/target/linux/package/Makefile

diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index 7e8588d99..a8f01ff5e 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -1,21 +1,22 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
-
-ifneq ($(BOARD),ar7)
-package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
-endif
-package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
-package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
-package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
-package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
-package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
-package-y += openwrt
-
-ifeq ($(BOARD)-$(KERNEL),brcm-2.4)
-package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
-package-$(BR2_PACKAGE_KMOD_DIAG) += diag
-wlcompat-compile: openwrt-compile
-endif
+include ../rules.mk
+
+package-$(CONFIG_PACKAGE_KMOD_ALSA) += alsa
+package-$(CONFIG_PACKAGE_KMOD_FUSE) += fuse
+package-$(CONFIG_PACKAGE_KMOD_HOSTAP) += hostap
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI) += madwifi
+package-$(CONFIG_PACKAGE_KMOD_MINI_FO) += mini_fo
+package-$(CONFIG_PACKAGE_KMOD_OPENSWAN) += openswan
+package-$(CONFIG_PACKAGE_KMOD_SHFS) += shfs
+package-$(CONFIG_PACKAGE_KMOD_SPCA5XX) += spca5xx
+package-$(CONFIG_PACKAGE_KMOD_SWITCH) += switch
+package-$(CONFIG_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
+package-$(CONFIG_PACKAGE_KMOD_DIAG) += diag
+package-$(CONFIG_PACKAGE_KMOD_WLCOMPAT) += wlcompat
+package-$(CONFIG_PACKAGE_KMOD_ZD1211) += zd1211
+
+wlcompat-compile: base-files-compile
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
@@ -23,31 +24,25 @@ prepare: $(patsubst %,%-prepare,$(package-y) $(package-m))
 compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 
-MAKEOPTS:=	BOARD="$(BOARD)" \
-		KERNEL="$(KERNEL)" \
-		IPKG="$(IPKG)" \
-		TARGET_DIR="$(TARGET_DIR)" \
-		BUILD_DIR="$(BUILD_DIR)" \
-		KERNEL_DIR="$(KERNEL_DIR)" \
-		LINUX_VERSION="$(LINUX_VERSION)" \
-		KERNEL_RELEASE="$(KERNEL_RELEASE)"
-
+KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)"
 
-%-prepare:
+%-prepare: FORCE
 	$(MAKE) -C $(patsubst %-prepare,%,$@) \
-		$(MAKEOPTS) \
+		$(KPKG_MAKEOPTS) \
 		prepare
 
-%-compile: %-prepare 
+%-compile: FORCE
 	$(MAKE) -C $(patsubst %-compile,%,$@) \
-		$(MAKEOPTS) \
+		$(KPKG_MAKEOPTS) \
 		compile
 
-%-install: %-compile
+%-install: FORCE
 	$(MAKE) -C $(patsubst %-install,%,$@) \
-		$(MAKEOPTS) \
+		$(KPKG_MAKEOPTS) \
 		install
 
-%-clean:
-	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
+%-clean: FORCE
+	@$(MAKE) -C $(patsubst %-clean,%,$@) \
+		$(KPKG_MAKEOPTS) \
+		clean