[au1000] refresh patches

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 4682dbe..4afcc43 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,75 +1,48 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # Main makefile for the toolchain
 #
 #
 # 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
+curdir:=toolchain

 
 

-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))
+# subdirectories to descend into
+$(curdir)/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc)
+$(curdir)/builddirs-compile:=. $(filter-out kernel-headers,$($(curdir)/builddirs))
+$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)

 
 

-all: install
-download: $(TARGETS_DOWNLOAD)
-install: $(TARGETS_INSTALL)
-clean: $(TARGETS_CLEAN)
-$(TARGETS_INSTALL): $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-
-ifeq ($(CONFIG_CCACHE),y)
-  uClibc-prepare: ccache-install
-endif
-uClibc-prepare: kernel-headers-prepare
+# builddir dependencies
+$(curdir)/uClibc/prepare:=$(curdir)/kernel-headers/prepare

 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)

-  binutils-prepare: uClibc-prepare
-  gcc-prepare: binutils-install
-  uClibc-compile: gcc-compile
+  $(curdir)/binutils/prepare:=$(curdir)/uClibc/prepare
+  $(curdir)/gcc/prepare:=$(curdir)/binutils/install
+  $(curdir)/uClibc/compile:=$(curdir)/gcc/compile
+  $(curdir)/gcc/install:=$(curdir)/uClibc/compile
+  $(curdir)/uClibc/install:=$(curdir)/gcc/install

 endif
 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_BUILD_DIR):
-       @mkdir -p $@
-
-%-download: FORCE
-       $(MAKE) -C $(patsubst %-download,%,$@) download
-
-%-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_$@
+ifneq ($(ARCH),)
+  $(TOOLCHAIN_DIR)/info.mk: .config
+       @for dir in $(TOOLCHAIN_DIR); do ( \
+               set -x; \
+               mkdir -p "$$dir"; \
+               cd "$$dir"; \
+               mkdir -p bin lib include stamp; \
+       ); done
+       @grep GCC_VERSION $@ >/dev/null 2>&1 || $(INSTALL_DATA) $(TOPDIR)/toolchain/info.mk $@
+       @touch $@
+endif

 
 

-%-compile: %-prepare 
-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-               $(MAKE) -C $(patsubst %-compile,%,$@) compile; \
-       }
-       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
+# prerequisites for the individual targets
+$(curdir)/ := .config prereq
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk
+$(curdir)//compile = $(1)/prepare
+$(curdir)//install = $(1)/compile

 
 

-%-install: %-compile
-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-               $(MAKE) -C $(patsubst %-install,%,$@) install; \
-       }
-       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
+$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:

 
 

-%-clean: FORCE
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
+$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed))
+$(eval $(call subdir,$(curdir)))