X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7a1a2ed509f01fd1310d233be8ed4c4c93d49d83..42b664a30a7481f05ecdd909baa4f0032e5e8e3d:/tools/Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 31b0becc3..492c02709 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,59 +1,33 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # 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-$(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)
-compile: $(TARGETS_COMPILE)
-install: $(STAMP)
-clean: $(TARGETS_CLEAN)
-
-squashfs-compile: lzma-install
-
-ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
-  $(STAMP): $(TARGETS_INSTALL)
-endif
-
-$(STAMP): $(TOPDIR)/.config
-	mkdir -p $(shell dirname $@)
-	touch $@
-	
-$(STAGING_DIR)/include-host:
-	@mkdir -p $@
-	@$(CP) ./include/*.h $@/
-
-$(TOOL_BUILD_DIR):
-	@mkdir -p $@
-
-%-prereq %-download %-clean: FORCE
-	$(MAKE) -C $* $(patsubst $*-%,%,$@)
-
-%-prepare: $(STAGING_DIR)/include-host $(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)
-else
-.NOTPARALLEL:
-endif
+curdir:=tools
+
+# subdirectories to descend into
+$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache)
+
+# builddir dependencies
+$(curdir)/squashfs/compile := $(curdir)/lzma/install
+
+# preparatory work
+define copy_include
+$(STAGING_DIR)/include-host/.done:
+	@mkdir -p $$$$(dirname $$@)
+	@cp $(1)/include/*.h $$$$(dirname $$@)/
+	@touch $$@
+$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
+$(curdir)//compile = $(STAGING_DIR)/include-host/.done
+endef
+$(eval $(call copy_include,$(curdir)))
+
+# prerequisites for the individual targets
+$(curdir)/ := .config prereq
+$(curdir)//install = $(1)/compile
+
+$(eval $(call stampfile,$(curdir),tools,install))
+$(eval $(call subdir,$(curdir)))