Updated to new upstream release (v1.3.16)

[openwrt.git] / target / linux / linux-2.4 / Makefile

diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile
index 5b6c71d..00d4693 100644 (file)
--- a/target/linux/linux-2.4/Makefile
+++ b/target/linux/linux-2.4/Makefile
@@ -55,6 +55,10 @@ ifeq ($(BOARD),brcm)
 include ./broadcom.mk
 endif
 
+ifeq ($(BOARD),soekris)
+include ./soekris.mk
+endif
+
 ifeq ($(BOARD),ar7)
 include ./ar7.mk
 endif
@@ -74,6 +78,7 @@ $(eval $(call KMOD_template,B44,b44,\
 ,CONFIG_B44))
 $(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
        $(MODULES_DIR)/kernel/net/bluetooth/*.o \
+       $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \
        $(MODULES_DIR)/kernel/drivers/bluetooth/*.o \
 ,CONFIG_BLUEZ))
 $(eval $(call KMOD_template,ARPT,arptables,\
@@ -239,7 +244,6 @@ compile: $(LINUX_DIR)/.modules_done $(TARGETS)
 install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
        rm -rf $(LINUX_BUILD_DIR)/root*
        echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
-       [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true
        $(MAKE) -C $(TOPDIR)/package \
                TARGET_DIR="$(LINUX_TARGET_DIR)" \
                IPKG_CONF="$(LINUX_BUILD_DIR)" \
@@ -248,6 +252,7 @@ install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                install
+       [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true
 
 mostlyclean:
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done