diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-02-25 17:49:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-02-25 17:49:25 +0000 |
| commit | cbb66de0880333855d76437237458d682adbd1d9 (patch) | |
| tree | 0a3f765739c7b8baaa4bfc47fced13c4b6888f63 /tools | |
| parent | b66907b65d6be323b815bab03e32b2af64f3e2b0 (diff) | |
| download | upstream-cbb66de0880333855d76437237458d682adbd1d9.tar.gz upstream-cbb66de0880333855d76437237458d682adbd1d9.tar.bz2 upstream-cbb66de0880333855d76437237458d682adbd1d9.zip | |
clean up stampfile mess for tools/ and toolchain/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6357 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/tools/Makefile b/tools/Makefile index f8f08781b5..d03ab38ee3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -11,23 +11,27 @@ TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware 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/.tools_installed all: install download: $(TARGETS_DOWNLOAD) -install: - $(MAKE) install-targets -install-targets: $(TARGETS_INSTALL) +compile: $(TARGETS_COMPILE) +install: $(STAMP) clean: $(TARGETS_CLEAN) squashfs-compile: lzma-install -TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles - -$(TOOL_STAMP_DIR): - mkdir -p $@ +ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP)) + $(STAMP): $(TARGETS_INSTALL) +endif +$(STAMP): + mkdir -p $(shell dirname $@) + touch $@ + $(STAGING_DIR)/include-host: @mkdir -p $@ @$(CP) ./include/*.h $@/ @@ -35,30 +39,7 @@ $(STAGING_DIR)/include-host: $(TOOL_BUILD_DIR): @mkdir -p $@ -%-download: FORCE - $(MAKE) -C $(patsubst %-download,%,$@) download - -%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR) FORCE - @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \ - $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \ - } - @touch $(TOOL_STAMP_DIR)/.tool_$@ - -%-compile: %-prepare - @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \ - $(MAKE) -C $(patsubst %-compile,%,$@) compile; \ - } - @touch $(TOOL_STAMP_DIR)/.tool_$@ - -%-install: %-compile - @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \ - $(MAKE) -C $(patsubst %-install,%,$@) install; \ - } - @touch $(TOOL_STAMP_DIR)/.tool_$@ - -%-clean: FORCE - @$(MAKE) -C $(patsubst %-clean,%,$@) clean - @rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-* +$(eval $(call default_subtargets,$(STAGING_DIR)/include-host $(TOOL_BUILD_DIR))) ifeq ($(MAKECMDGOALS),install-targets) MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) |