kernel: fix dependencies for .config, use selections from oldconfig when running...

[openwrt/openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index 4853e3fbd2df3a829e4fc8d0213f4a6c182b000f..4885ab98d3e3e97305359c2c5e6c819d7d38ed0a 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -20,12 +20,20 @@ IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
 download: $(patsubst %,%-download,$(TARGETS-y))
 prepare: linux-prepare
 compile: linux-compile image_compile
-install: image_clean linux-install sdk_install image_install imagebuilder_install
+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
@@ -43,14 +51,5 @@ image_install: image_compile
 imagebuilder_install: image_install
        $(MAKE) -C imagebuilder 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
-
+%-prereq %-prepare %-download %-clean %-compile %-install %-refresh %-update: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)