X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Fpackage%2FMakefile;h=792fb7bd6749699b7775e512aec5c77a00f04531;hb=02eae88c3599c13df02546694887b629e8892fd0;hp=adce4d4eed3881bbed5845e5fdfd273c0df1b971;hpb=c45b5fbb998ca7888607a78b8f89aff75649ebc2;p=openwrt.git

diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index adce4d4eed..792fb7bd67 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -1,50 +1,53 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
-
-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
-
-ifeq ($(BOARD),brcm)
-package-y += nvram openwrt
-
-ifeq ($(LINUX_VERSION),2.4.30)
-package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
-endif
-
-nvram-compile: openwrt-compile
-endif
+include ../rules.mk
+
+package-y += base-files
+package-$(CONFIG_PACKAGE_KMOD_ALSA) += alsa
+package-$(CONFIG_PACKAGE_KMOD_FUSE) += fuse
+package-$(CONFIG_PACKAGE_KMOD_HOSTAP) += hostap
+package-$(CONFIG_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone
+package-$(CONFIG_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI) += madwifi
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old
+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
+
+bcm43xx-standalone-compile: ieee80211-dscape-compile
+wlcompat-compile: base-files-compile
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+prepare: $(patsubst %,%-prepare,$(package-y) $(package-m))
 compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 
-MAKEOPTS:=	BOARD="$(BOARD)" \
-		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:
 	$(MAKE) -C $(patsubst %-prepare,%,$@) \
-		$(MAKEOPTS) \
+		$(KPKG_MAKEOPTS) \
 		prepare
 
-%-compile: %-prepare 
+%-compile:
 	$(MAKE) -C $(patsubst %-compile,%,$@) \
-		$(MAKEOPTS) \
+		$(KPKG_MAKEOPTS) \
 		compile
 
-%-install: %-compile
+%-install:
 	$(MAKE) -C $(patsubst %-install,%,$@) \
-		$(MAKEOPTS) \
+		$(KPKG_MAKEOPTS) \
 		install
 
 %-clean:
-	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
+	@$(MAKE) -C $(patsubst %-clean,%,$@) \
+		$(KPKG_MAKEOPTS) \
+		clean