build system fixes, more cleanup

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 0c06fe9..21d2b68 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,45 +1,30 @@
+# 
+# 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:=sed utils binutils gcc uClibc ipkg-utils
-
-TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
-
-all: install
-install: $(TARGETS_INSTALL)
-clean: $(TARGETS_CLEAN)
-
-uClibc-prepare: kernel-headers-prepare sed-install utils-install
-binutils-prepare: uClibc-prepare
-gcc-prepare: binutils-install
-uClibc-compile: gcc-prepare
-gcc-install: uClibc-install
-
-$(STAMP_DIR):
-       mkdir -p $(STAMP_DIR)
-
-$(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
-
-$(TOOL_BUILD_DIR):
-       @mkdir -p $(TOOL_BUILD_DIR)
-
-%-prepare: $(STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
-       @[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-       @touch $(STAMP_DIR)/.toolchain_$@
-
-%-compile: %-prepare 
-       @[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
-       @touch $(STAMP_DIR)/.toolchain_$@
-
-%-install: %-compile
-       @[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
-       @touch $(STAMP_DIR)/.toolchain_$@
-
-%-clean:
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
+#
+
+# subdirectories to descend into
+toolchain/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc)
+
+# builddir dependencies
+toolchain/uClibc/prepare:=toolchain/kernel-headers/prepare
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  toolchain/binutils/prepare:=toolchain/uClibc/prepare
+  toolchain/gcc/prepare:=toolchain/binutils/install
+  toolchain/uClibc/compile:=toolchain/gcc/compile
+endif
+toolchain/gcc/install:=toolchain/uClibc/install
+
+# 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 stampfile,toolchain,toolchain))
+$(eval $(call subdir,toolchain))