X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2FMakefile;h=2d8d88219da78ee764f8b76f9d30eee8eac4ef1e;hb=79a17f08d7bd5640b46c51e32bdda9a80b4d329e;hp=8a39def3744165a2eccecfc4623dd9d01db8a917;hpb=e3c13ef5ddd89beedb70b05092387b50228174dc;p=openwrt-10.03%2F.git

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 8a39def37..2d8d88219 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,35 +1,54 @@
+# 
+# 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 libnotimpl
 
-TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+TARGETS-y:=kernel-headers libnotimpl
+TARGETS-$(CONFIG_GDB) += gdb
+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: kernel-headers-prepare sed-install utils-install
-binutils-prepare: uClibc-prepare
-gcc-prepare: binutils-install
-uClibc-compile: gcc-prepare
-gcc-compile: uClibc-install
+uClibc-prepare: kernel-headers-prepare
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  binutils-prepare: uClibc-prepare
+  gcc-prepare: binutils-install
+  uClibc-compile: gcc-compile
+  libnotimpl-compile: gcc-install
+endif
+gcc-install: uClibc-install
 
 TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
 
+$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME):
+	@mkdir -p $@
+	@ln -sf ../lib $@/lib
+
 $(TOOLCHAIN_STAMP_DIR):
-	mkdir -p $(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: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
+%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) $(TOOLCHAIN_BUILD_DIR) FORCE
 	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
 	}
@@ -47,7 +66,7 @@ $(TOOL_BUILD_DIR):
 	}
 	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
-%-clean:
+%-clean: FORCE
 	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
 	@rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*