From cbb66de0880333855d76437237458d682adbd1d9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 25 Feb 2007 17:49:25 +0000 Subject: clean up stampfile mess for tools/ and toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6357 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/Makefile | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) (limited to 'toolchain/Makefile') diff --git a/toolchain/Makefile b/toolchain/Makefile index 4682dbed17..4832a657df 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -16,14 +16,20 @@ ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) 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 all: install download: $(TARGETS_DOWNLOAD) -install: $(TARGETS_INSTALL) +compile: $(TARGETS_COMPILE) +install: $(STAMP) clean: $(TARGETS_CLEAN) -$(TARGETS_INSTALL): $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) + +ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP)) + $(STAMP): $(TARGETS_INSTALL) +endif ifeq ($(CONFIG_CCACHE),y) uClibc-prepare: ccache-install @@ -36,40 +42,16 @@ ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) endif gcc-install: uClibc-install -TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles +$(STAMP): + mkdir -p $(shell dirname $@) + touch $@ $(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_$@ - -%-compile: %-prepare - @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \ - $(MAKE) -C $(patsubst %-compile,%,$@) compile; \ - } - @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ - -%-install: %-compile - @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \ - $(MAKE) -C $(patsubst %-install,%,$@) install; \ - } - @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ - -%-clean: FORCE - @$(MAKE) -C $(patsubst %-clean,%,$@) clean - @rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-* +$(eval $(call default_subtargets,$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) $(TOOLCHAIN_BUILD_DIR))) -- cgit v1.2.3