backport jffs2 eof detect changes from 2.6

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

diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index db63d4f..a8f01ff 100644 (file)
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -1,22 +1,22 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
+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
 
-ifneq ($(BOARD),ar7)
-package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
-endif
-package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
-package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
-package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
-package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
-package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
-package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
-package-y += base-files
-
-ifeq ($(BOARD)-$(KERNEL),brcm-2.4)
-package-$(BR2_PACKAGE_KMOD_DIAG) += diag
-package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
 wlcompat-compile: base-files-compile
-endif
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
@@ -24,43 +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:
-       @$(START_TRACE) "target/linux/package/$(patsubst %-prepare,%,$@)/prepare: "
+%-prepare: FORCE
        $(MAKE) -C $(patsubst %-prepare,%,$@) \
-               $(MAKEOPTS) \
+               $(KPKG_MAKEOPTS) \
                prepare
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
 
-%-compile:
-       @$(START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: "
+%-compile: FORCE
        $(MAKE) -C $(patsubst %-compile,%,$@) \
-               $(MAKEOPTS) \
+               $(KPKG_MAKEOPTS) \
                compile
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
 
-%-install:
-       @$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
+%-install: FORCE
        $(MAKE) -C $(patsubst %-install,%,$@) \
-               $(MAKEOPTS) \
+               $(KPKG_MAKEOPTS) \
                install
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
 
-%-clean:
-       @$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
+%-clean: FORCE
+       @$(MAKE) -C $(patsubst %-clean,%,$@) \
+               $(KPKG_MAKEOPTS) \
+               clean