move target/linux/image to target/image

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index d64053c..836469d 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,23 +1,34 @@
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
 
 all: install
 
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
-TARGETS:=linux utils lzma
+TARGETS-y := linux utils
+TARGETS-$(CONFIG_SDK) += sdk
 
-linux-compile: utils-install lzma-install
+linux-compile: utils-install
 linux-install: $(BIN_DIR)
+sdk-compile: linux-install
+image_install: linux-install
 
-download: $(patsubst %,%-source,$(TARGETS))
+download: $(patsubst %,%-source,$(TARGETS-y))
 prepare: linux-prepare
-compile: linux-compile
-install: image_clean linux-install
-clean: $(patsubst %,%-clean,$(TARGETS)) 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: FORCE
+       $(MAKE) -C image/$(BOARD) clean
        rm -f $(BIN_DIR)/openwrt-*
+       
+image_compile: FORCE
+       $(MAKE) -C image/$(BOARD) compile
+
+image_install: image_compile
+       $(MAKE) -C image/$(BOARD) install
 
 %-clean: FORCE
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
@@ -27,11 +38,6 @@ image_clean: FORCE
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
        $(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-rebuild: FORCE
-       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
        $(MAKE) -C $(patsubst %-install,%,$@) install
-linux-imagebuilder: FORCE
-       $(MAKE) -C linux imagebuilder
-