ixp4xx-2.6/config: Removed the disabling of swap so that the generic enabling of...

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index d5e6bea..4885ab9 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -12,25 +12,31 @@ all: install
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
-TARGETS-y := linux utils
-TARGETS-$(CONFIG_SDK) += sdk
-
-linux-compile: utils-install
 linux-install: $(BIN_DIR)
 image_install: linux-install
 
 IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
 
-
 download: $(patsubst %,%-download,$(TARGETS-y))
 prepare: linux-prepare
 compile: linux-compile image_compile
-install: image_clean $(patsubst %,%-install,$(TARGETS-y)) image_install
-clean: $(patsubst %,%-clean,$(TARGETS-y)) image_clean
+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
+       [ \! -f $(IMAGE_DIR)/Makefile ] || $(MAKE) -C $(IMAGE_DIR) prereq
+
+sdk_install: FORCE
+       $(MAKE) -C sdk install
 
 image_clean: FORCE
        $(MAKE) -C $(IMAGE_DIR) clean
@@ -42,14 +48,8 @@ image_compile: FORCE
 image_install: image_compile
        $(MAKE) -C $(IMAGE_DIR) install
 
-%-clean: FORCE
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean
-%-download: FORCE
-       $(MAKE) -C $(patsubst %-download,%,$@) download
-%-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
 
+%-prereq %-prepare %-download %-clean %-compile %-install %-refresh %-update: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)