clean up a few things in image build makefiles and fix unnecessary grub rebuilds

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index d64053c..724ac44 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,37 +1,64 @@
+# 
+# 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 $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/target.mk

 
 all: install
 
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
 
 all: install
 
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 

-TARGETS:=linux utils lzma
-
-linux-compile: utils-install lzma-install

 linux-install: $(BIN_DIR)
 linux-install: $(BIN_DIR)

+image_install: linux-install
+
+IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image

 
 

-download: $(patsubst %,%-source,$(TARGETS))
+download: $(patsubst %,%-download,$(TARGETS-y))

 prepare: linux-prepare
 prepare: linux-prepare

-compile: linux-compile
-install: image_clean linux-install
-clean: $(patsubst %,%-clean,$(TARGETS)) 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
 
 image_clean: FORCE

+       $(MAKE) -C $(IMAGE_DIR) clean

        rm -f $(BIN_DIR)/openwrt-*
        rm -f $(BIN_DIR)/openwrt-*

+       
+image_compile: FORCE
+       $(MAKE) -C $(IMAGE_DIR) compile
+
+image_install: image_compile
+       $(MAKE) -C $(IMAGE_DIR) install
+
+imagebuilder_install: image_install
+       $(MAKE) -C imagebuilder install

 
 %-clean: FORCE
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
 
 %-clean: FORCE
        $(MAKE) -C $(patsubst %-clean,%,$@) clean

-%-source: FORCE
-       $(MAKE) -C $(patsubst %-source,%,$@) source
+%-download: FORCE
+       $(MAKE) -C $(patsubst %-download,%,$@) download

 %-prepare: FORCE
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
        $(MAKE) -C $(patsubst %-compile,%,$@) compile
 %-prepare: FORCE
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
        $(MAKE) -C $(patsubst %-compile,%,$@) compile

-%-rebuild: FORCE
-       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild

 %-install: %-compile
        $(MAKE) -C $(patsubst %-install,%,$@) install
 %-install: %-compile
        $(MAKE) -C $(patsubst %-install,%,$@) install

-linux-imagebuilder: FORCE
-       $(MAKE) -C linux imagebuilder
-