cleanup in target/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1205 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 12 insertions, 8 deletions

diff --git a/openwrt/target/linux/Makefile b/openwrt/target/linux/Makefile
index d1b4d545a..604c739b5 100644
--- a/openwrt/target/linux/Makefile
+++ b/openwrt/target/linux/Makefile
@@ -3,36 +3,40 @@ include $(TOPDIR)/rules.mk
 define kernel_template
 
 $(1)/$(2)-clean:
-	$(MAKE) -C $(1) BOARD="$(2)" clean
+	$(MAKE) -C linux-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	$(MAKE) -C $(1) BOARD="$(2)" prepare
+	$(MAKE) -C linux-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	$(MAKE) -C $(1) BOARD="$(2)" compile
+	$(MAKE) -C linux-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	$(MAKE) -C $(1) BOARD="$(2)" rebuild
+	$(MAKE) -C linux-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	$(MAKE) -C $(1) BOARD="$(2)" install
+	$(MAKE) -C linux-$(1) BOARD="$(2)" install
+
+$(1)/$(2)-image: $(1)/$(2)-install
+	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 ifeq ($(BR2_LINUX_$(3)),y)
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
-install: $(1)/$(2)-install
+install: $(1)/$(2)-image
 endif
 
 .PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install
 endef
 
 prepare:
+	$(MAKE) -C image prepare
 compile:
+	$(MAKE) -C image compile
 install:
 rebuild:
 clean:
-	rm -rf $(BUILD_DIR)/kernel
 
-$(eval $(call kernel_template,linux-2.4,brcm,2_4_BRCM))
+$(eval $(call kernel_template,2.4,brcm,2_4_BRCM))