X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=target%2FMakefile;h=1b6cbb54ee1014e6f024f8c8fba6fe1e698fd6a9;hb=a233c7eec9fb19f0cca2ad2831daa5c39d764d54;hp=a14749fcaeb8e3960632b31166393d6bc0b721ba;hpb=d0f611787c94090697587c02e1b5c2f3d45b0b0a;p=openwrt-10.03%2F.git

diff --git a/target/Makefile b/target/Makefile
index a14749fca..1b6cbb54e 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,37 +1,54 @@
+# 
+# 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
 linux-install: $(BIN_DIR)
+image_install: linux-install
 
-prepare: 
-compile: linux-compile
-install: image_clean linux-install
-clean: linux-clean utils-clean lzma-clean image_clean
+IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
 
-image_clean:
+download: $(patsubst %,%-download,$(TARGETS-y))
+prepare: linux-prepare
+compile: linux-compile image_compile
+install: linux-install image_install 
+
+ifeq ($(CONFIG_SDK),y)
+install: sdk_install
+endif
+ifeq ($(CONFIG_IB),y)
+install: imagebuilder_install
+endif
+
+clean: linux-clean sdk-clean imagebuilder-clean image_clean
+
+prereq: FORCE
+	$(MAKE) -C linux/$(BOARD)-$(KERNEL) prereq
+	$(MAKE) -C $(IMAGE_DIR) prereq
+
+sdk_install: FORCE
+	$(MAKE) -C sdk install
+
+image_clean: FORCE
+	$(MAKE) -C $(IMAGE_DIR) clean
 	rm -f $(BIN_DIR)/openwrt-*
+	
+image_compile: FORCE
+	$(MAKE) -C $(IMAGE_DIR) compile
+
+image_install: image_compile
+	$(MAKE) -C $(IMAGE_DIR) install
 
-%-clean:
-	@$(TRACE) target/$(patsubst %-clean,%,$@)/clean
-	$(MAKE) -C $(patsubst %-clean,%,$@) clean
-%-prepare:
-	@$(TRACE) target/$(patsubst %-prepare,%,$@)/prepare
-	$(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
+imagebuilder_install: image_install
+	$(MAKE) -C imagebuilder install
 
+$(eval $(call default_subtargets,))