some more stuff that i missed before

[openwrt.git] / target / linux / package / Makefile

diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index 055bd2f..7e8588d 100644 (file)
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -1,40 +1,51 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
 
 # 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_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_SHFS) += shfs
 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan

-ifeq ($(LINUX_VERSION),2.4.30)
+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_WLCOMPAT) += wlcompat

+package-$(BR2_PACKAGE_KMOD_DIAG) += diag
+wlcompat-compile: openwrt-compile

 endif
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 endif
 
 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))
 
 compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 

-%-prepare:
-       $(MAKE) -C $(patsubst %-prepare,%,$@) \
+MAKEOPTS:=     BOARD="$(BOARD)" \
+               KERNEL="$(KERNEL)" \
+               IPKG="$(IPKG)" \

                TARGET_DIR="$(TARGET_DIR)" \
                BUILD_DIR="$(BUILD_DIR)" \
                KERNEL_DIR="$(KERNEL_DIR)" \
                LINUX_VERSION="$(LINUX_VERSION)" \
                TARGET_DIR="$(TARGET_DIR)" \
                BUILD_DIR="$(BUILD_DIR)" \
                KERNEL_DIR="$(KERNEL_DIR)" \
                LINUX_VERSION="$(LINUX_VERSION)" \

+               KERNEL_RELEASE="$(KERNEL_RELEASE)"
+
+
+%-prepare:
+       $(MAKE) -C $(patsubst %-prepare,%,$@) \
+               $(MAKEOPTS) \

                prepare
 
 %-compile: %-prepare 
        $(MAKE) -C $(patsubst %-compile,%,$@) \
                prepare
 
 %-compile: %-prepare 
        $(MAKE) -C $(patsubst %-compile,%,$@) \

-               TARGET_DIR="$(TARGET_DIR)" \
-               BUILD_DIR="$(BUILD_DIR)" \
-               KERNEL_DIR="$(KERNEL_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
+               $(MAKEOPTS) \

                compile
 
 %-install: %-compile
        $(MAKE) -C $(patsubst %-install,%,$@) \
                compile
 
 %-install: %-compile
        $(MAKE) -C $(patsubst %-install,%,$@) \

-               TARGET_DIR="$(TARGET_DIR)" \
-               BUILD_DIR="$(BUILD_DIR)" \
-               KERNEL_DIR="$(KERNEL_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
+               $(MAKEOPTS) \

                install
 
 %-clean:
                install
 
 %-clean: