X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2FMakefile;h=68e7dab534f0ce6f6aef3563aa20baabad20136f;hb=5448a92c7128dfc5ed3b44443683929834b1e372;hp=9c315549e5d2f9c42443e6795470db5b37703a27;hpb=23a2f742c069076850dca0cc1b966a073a9f4b83;p=openwrt-10.03%2F.git

diff --git a/tools/Makefile b/tools/Makefile
index 9c315549e..68e7dab53 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,7 @@
 # Main makefile for the host tools
 #
 include $(TOPDIR)/rules.mk
-TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils
+TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline
 TARGETS-$(CONFIG_CCACHE) += ccache
 
 TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
@@ -32,17 +32,26 @@ endif
 $(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 $@
 
-$(TARGETS_COMPILE) $(TARGETS_INSTALL): $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR)
+%-prereq %-download %-clean %-refresh %-update: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-$(eval $(call default_subtargets,))
+%-prepare: $(TOOL_HOST_INCLUDES) $(TOOL_BUILD_DIR) FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+%-compile: %-prepare FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
+	
+%-install: %-compile FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
 ifeq ($(MAKECMDGOALS),install-targets)
 MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)