X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=toolchain%2FMakefile;h=ceae2269a6c82f4c1ae6d06205d8a567cde10101;hp=c573debe4954d860d8ea002ffdcadac31c5a46b3;hb=825044a682acfa790765ee03fb49e086c833c8b1;hpb=e772a8b1a3b5cb5a2d4ad571526f66a2e18485a4

diff --git a/toolchain/Makefile b/toolchain/Makefile
index c573debe49..ceae2269a6 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,45 +1,72 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # Main makefile for the toolchain
+#
 include $(TOPDIR)/rules.mk
-TARGETS:=sed utils binutils gcc uClibc ipkg-utils gdb
 
-TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+TARGETS-y:=kernel-headers
+TARGETS-$(CONFIG_GDB) += gdb
+TARGETS-$(CONFIG_CCACHE) += ccache
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  TARGETS-y+=binutils gcc uClibc
+endif
+
+TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
 
 all: install
+download: $(TARGETS_DOWNLOAD)
 install: $(TARGETS_INSTALL)
 clean: $(TARGETS_CLEAN)
+$(TARGETS_INSTALL): $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
+
+uClibc-prepare: ccache-prepare kernel-headers-prepare
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  binutils-prepare: uClibc-prepare
+  gcc-prepare: binutils-install
+  uClibc-compile: gcc-compile
+endif
+gcc-install: uClibc-install
+
+TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
 
-uClibc-prepare: kernel-headers-prepare sed-install utils-install
-binutils-prepare: uClibc-prepare
-gcc-prepare: binutils-install
-uClibc-compile: gcc-prepare
-gcc-compile: uClibc-install
+$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME):
+	@mkdir -p $@
+	@ln -sf ../lib $@/lib
 
-$(STAMP_DIR):
-	mkdir -p $(STAMP_DIR)
+$(TOOLCHAIN_STAMP_DIR):
+	mkdir -p $@
 
-$(STAGING_DIR):
-	@mkdir -p $(STAGING_DIR)/lib
-	@mkdir -p $(STAGING_DIR)/include
-	@mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-	@ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+$(TOOLCHAIN_BUILD_DIR):
+	@mkdir -p $@
 
-$(TOOL_BUILD_DIR):
-	@mkdir -p $(TOOL_BUILD_DIR)
+%-download: FORCE
+	$(MAKE) -C $(patsubst %-download,%,$@) download
 
-%-prepare: $(STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
-	@[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-	@touch $(STAMP_DIR)/.toolchain_$@
+%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) $(TOOLCHAIN_BUILD_DIR) FORCE
+	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+	}
+	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-compile: %-prepare 
-	@[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
-	@touch $(STAMP_DIR)/.toolchain_$@
+	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+		$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+	}
+	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-install: %-compile
-	@[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
-	@touch $(STAMP_DIR)/.toolchain_$@
+	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+		$(MAKE) -C $(patsubst %-install,%,$@) install; \
+	}
+	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
-%-clean:
+%-clean: FORCE
 	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
-	@rm -f $(STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
+	@rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*