X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a35fb6c438c11e118d9241be1cdf6d3e06b7c9bb..92855cd186470c045637045ff88ebbb223f07fb3:/toolchain/Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 043a119b1..48637c11b 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -7,62 +7,57 @@
 # Main makefile for the toolchain
 #
 include $(TOPDIR)/rules.mk
-TARGETS-y:=sed kernel-headers sstrip binutils gcc uClibc ipkg-utils libnotimpl squashfs jffs2 lzma
+
+TARGETS-y:=kernel-headers
 TARGETS-$(CONFIG_GDB) += gdb
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  TARGETS-y+=binutils gcc uClibc
+endif
 
-TARGETS_DOWNLOAD:=$(patsubst %,%-source,$(TARGETS-y))
+TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
+TARGETS_PREPARE:=$(patsubst %,%-prepare,$(TARGETS-y))
+TARGETS_COMPILE:=$(patsubst %,%-compile,$(TARGETS-y))
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
+STAMP:=$(STAGING_DIR)/stampfiles/.toolchain_installed
 
 all: install
 download: $(TARGETS_DOWNLOAD)
-install: $(TARGETS_INSTALL)
+compile: $(TARGETS_COMPILE)
+install: $(STAMP) 
 clean: $(TARGETS_CLEAN)
 
-kernel-headers-prepare: sed-install
-uClibc-prepare: kernel-headers-prepare sstrip-install
-binutils-prepare: uClibc-prepare
-gcc-prepare: binutils-install
-uClibc-compile: gcc-compile
-gcc-install: uClibc-install
-squashfs-compile: lzma-install
-
-TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
+ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
+  $(STAMP): $(TARGETS_INSTALL)
+endif
 
-$(TOOLCHAIN_STAMP_DIR):
-	mkdir -p $@
+uClibc-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
 
-$(STAGING_DIR):
-	@mkdir -p $@/lib
-	@mkdir -p $@/include
-	@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
-	@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
+$(STAMP):
+	mkdir -p $(shell dirname $@)
+	touch $@
 
-$(TOOL_BUILD_DIR):
+$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME):
 	@mkdir -p $@
+	@ln -sf ../lib $@/lib
 
-%-source: FORCE
-	$(MAKE) -C $(patsubst %-source,%,$@) source
-
-%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
-	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
-	}
-	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
-
-%-compile: %-prepare 
-	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-		$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
-	}
-	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
+$(TOOLCHAIN_BUILD_DIR):
+	@mkdir -p $@
 
-%-install: %-compile
-	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-		$(MAKE) -C $(patsubst %-install,%,$@) install; \
-	}
-	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
+%-prereq %-download %-clean %-refresh %-update: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-%-clean: FORCE
-	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
-	@rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
+%-prepare: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) $(TOOLCHAIN_BUILD_DIR)	
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
+%-compile: %-prepare FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
+	
+%-install: %-compile FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)