add reboot fix from #1312

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index 0a14344..1b6cbb5 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,34 +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)
 
-TARGETS-y := linux utils
-TARGETS-$(CONFIG_SDK) += sdk
-
-linux-compile: utils-install
 linux-install: $(BIN_DIR)
-sdk-compile: linux-install
+image_install: linux-install
+
+IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
 
-download: $(patsubst %,%-source,$(TARGETS-y))
+download: $(patsubst %,%-download,$(TARGETS-y))
 prepare: linux-prepare
-compile: linux-compile
-install: image_clean $(patsubst %,%-install,$(TARGETS-y))
-clean: $(patsubst %,%-clean,$(TARGETS-y)) image_clean
+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: FORCE
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean
-%-source: FORCE
-       $(MAKE) -C $(patsubst %-source,%,$@) source
-%-prepare: FORCE
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-%-compile: %-prepare
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-install: %-compile
-       $(MAKE) -C $(patsubst %-install,%,$@) install
+imagebuilder_install: image_install
+       $(MAKE) -C imagebuilder install
 
+$(eval $(call default_subtargets,))