build system fixes, more cleanup

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 7773c32..21d2b68 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,56 +1,30 @@
 # 
-# 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
 #
-include $(TOPDIR)/rules.mk
 
-TARGETS-y:=kernel-headers
-TARGETS-$(CONFIG_GDB) += gdb
-ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
-  TARGETS-y+=binutils gcc uClibc
-endif
-
-TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(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
+# subdirectories to descend into
+toolchain/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc)
 
-all: install
-download: $(TARGETS_DOWNLOAD)
-compile: $(TARGETS_COMPILE)
-install: $(STAMP) 
-clean: $(TARGETS_CLEAN)
-
-ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
-  $(STAMP): $(TARGETS_INSTALL)
-endif
-
-ifeq ($(CONFIG_CCACHE),y)
-  uClibc-prepare: ccache-install
-endif
-uClibc-prepare: kernel-headers-prepare
+# builddir dependencies
+toolchain/uClibc/prepare:=toolchain/kernel-headers/prepare
 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
-  binutils-prepare: uClibc-prepare
-  gcc-prepare: binutils-install
-  uClibc-compile: gcc-compile
+  toolchain/binutils/prepare:=toolchain/uClibc/prepare
+  toolchain/gcc/prepare:=toolchain/binutils/install
+  toolchain/uClibc/compile:=toolchain/gcc/compile
 endif
-gcc-install: uClibc-install
-
-$(STAMP):
-       mkdir -p $(shell dirname $@)
-       touch $@
-
-$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME):
-       @mkdir -p $@
-       @ln -sf ../lib $@/lib
+toolchain/gcc/install:=toolchain/uClibc/install
 
-$(TOOLCHAIN_BUILD_DIR):
-       @mkdir -p $@
+# prerequisites for the individual targets
+toolchain/ := .config $(tools/stamp)
+toolchain//prepare = $(STAGING_DIR)/include-host/.done
+toolchain//compile = $(1)/prepare
+toolchain//install = $(1)/compile
 
-$(eval $(call default_subtargets,$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) $(TOOLCHAIN_BUILD_DIR)))
+$(eval $(call stampfile,toolchain,toolchain))
+$(eval $(call subdir,toolchain))