avoid a race condition that might lead to dnsmasq reading an empty resolv.conf (...

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 9cc24d5..48637c1 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,57 +1,63 @@
+# 
+# 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
+TARGETS-$(CONFIG_GDB) += gdb
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  TARGETS-y+=binutils gcc uClibc
+endif
+
+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
-install: $(TARGETS_INSTALL)
+download: $(TARGETS_DOWNLOAD)
+compile: $(TARGETS_COMPILE)
+install: $(STAMP) 
 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-compile: uClibc-install
-
-TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
-
-$(TOOLCHAIN_STAMP_DIR):
-       mkdir -p $(TOOLCHAIN_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: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-               $(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare; \
-               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
-       }
-       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
-
-%-compile: %-prepare 
-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-               $(TRACE) toolchain/$(patsubst %-compile,%,$@)/compile; \
-               $(MAKE) -C $(patsubst %-compile,%,$@) compile; \
-       }
-       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
-
-%-install: %-compile
-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-               $(TRACE) toolchain/$(patsubst %-install,%,$@)/install; \
-               $(MAKE) -C $(patsubst %-install,%,$@) install; \
-       }
-       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
-
-%-clean:
-       $(TRACE) toolchain/$(patsubst %-clean,%,$@)/clean
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
+ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
+  $(STAMP): $(TARGETS_INSTALL)
+endif
+
+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
+
+$(STAMP):
+       mkdir -p $(shell dirname $@)
+       touch $@
+
+$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME):
+       @mkdir -p $@
+       @ln -sf ../lib $@/lib
+
+$(TOOLCHAIN_BUILD_DIR):
+       @mkdir -p $@
+
+%-prereq %-download %-clean %-refresh %-update: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+%-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 $*-%,%,$@)