X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2FMakefile;h=265c6aebf5c997b154eaf86e25656e21ad07223f;hb=5c1debbe907e7707ac59087cf2029a9ee3ed69c0;hp=f8f08781b5380e23f9d02a681a53ec6f23e64eb1;hpb=c41fbbc115a5f16a61cf16419a8fe70ab5d00bdd;p=openwrt-10.03%2F.git

diff --git a/tools/Makefile b/tools/Makefile
index f8f08781b..265c6aebf 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,57 +8,50 @@
 #
 include $(TOPDIR)/rules.mk
 TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils
+TARGETS-$(CONFIG_CCACHE) += ccache
 
 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
+ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
+  $(STAMP): $(TARGETS_INSTALL)
+endif
 
-$(TOOL_STAMP_DIR):
-	mkdir -p $@
+$(STAMP): $(TOPDIR)/.config
+	mkdir -p $(shell dirname $@)
+	touch $@
 
-$(STAGING_DIR)/include-host:
-	@mkdir -p $@
-	@$(CP) ./include/*.h $@/
+TOOL_HOST_INCLUDES:=$(patsubst ./include/%.h,$(STAGING_DIR)/include-host/%.h,$(wildcard ./include/*.h))
+$(TOOL_HOST_INCLUDES): $(STAGING_DIR)/include-host/%.h: ./include/%.h
+	@mkdir -p $(STAGING_DIR)/include-host
+	$(CP) $< $@
 
 $(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_$@
+%-prereq %-download %-clean %-refresh: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-%-install: %-compile
-	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
-		$(MAKE) -C $(patsubst %-install,%,$@) install; \
-	}
-	@touch $(TOOL_STAMP_DIR)/.tool_$@
+%-prepare: $(TOOL_HOST_INCLUDES) $(TOOL_BUILD_DIR) FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-%-clean: FORCE
-	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
-	@rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-*
+%-compile: %-prepare FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
+	
+%-install: %-compile FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
 ifeq ($(MAKECMDGOALS),install-targets)
 MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)