Ensure dropbear is installed before disabling telnet (#920)

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index 24c3403..dc21033 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,41 +1,48 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
 
 all: install
 
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
-linux-compile: utils-install lzma-install
+TARGETS-y := linux utils
+TARGETS-$(CONFIG_SDK) += sdk
+
+linux-compile: utils-install
 linux-install: $(BIN_DIR)
+image_install: linux-install
 
+download: $(patsubst %,%-download,$(TARGETS-y))
 prepare: linux-prepare
-compile: linux-compile
-install: image_clean linux-install
-clean: linux-clean utils-clean lzma-clean image_clean
+compile: linux-compile image_compile
+install: image_clean $(patsubst %,%-install,$(TARGETS-y)) image_install
+clean: $(patsubst %,%-clean,$(TARGETS-y)) image_clean
 
-image_clean:
+image_clean: FORCE
+       $(MAKE) -C image/$(BOARD) clean
        rm -f $(BIN_DIR)/openwrt-*
+       
+image_compile: FORCE
+       $(MAKE) -C image/$(BOARD) compile
 
-linux/package/%:
-       $(MAKE) -C $(TOPDIR)/target/linux $(patsubst linux/%,%,$@)
+image_install: image_compile
+       $(MAKE) -C image/$(BOARD) install
 
-%-clean:
-       @$(TRACE) target/$(patsubst %-clean,%,$@)-clean
+%-clean: FORCE
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
-%-prepare:
-       @$(TRACE) target/$(patsubst %-prepare,%,$@)-prepare
+%-download: FORCE
+       $(MAKE) -C $(patsubst %-download,%,$@) download
+%-prepare: FORCE
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
-       @$(TRACE) target/$(patsubst %-compile,%,$@)-compile
        $(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-rebuild: 
-       @$(TRACE) target/$(patsubst %-rebuild,%,$@)-rebuild
-       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
-       @$(TRACE) target/$(patsubst %-install,%,$@)-install
        $(MAKE) -C $(patsubst %-install,%,$@) install
-linux-imagebuilder:
-       @$(TRACE) target/linux/imagebuilder
-       $(MAKE) -C linux imagebuilder
-