clean up uml-2.6 config, fixes buildbot pcmcia-cs error

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index dc21033..3f97b9a 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -12,28 +12,44 @@ 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: image_clean 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/$(BOARD) clean
+       $(MAKE) -C $(IMAGE_DIR) clean
        rm -f $(BIN_DIR)/openwrt-*
        
 image_compile: FORCE
-       $(MAKE) -C image/$(BOARD) compile
+       $(MAKE) -C $(IMAGE_DIR) compile
 
 image_install: image_compile
-       $(MAKE) -C image/$(BOARD) install
+       $(MAKE) -C $(IMAGE_DIR) install
+
+imagebuilder_install: image_install
+       $(MAKE) -C imagebuilder install
 
 %-clean: FORCE
        $(MAKE) -C $(patsubst %-clean,%,$@) clean