X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d415d5f3e6790f5c5ddb2183c2e705d0dcac44d4..f1e8cfde7ab2bf0c7ee3d50d88fc4aa5d6d4fe41:/tools/Makefile

diff --git a/tools/Makefile b/tools/Makefile
index d03ab38ee..ea4ce7081 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,48 +1,35 @@
 # 
-# 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_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
+file:=${lastword ${MAKEFILE_LIST}}
+curdir:=$(patsubst %/Makefile,%,${file})
 
-all: install
-download: $(TARGETS_DOWNLOAD)
-compile: $(TARGETS_COMPILE)
-install: $(STAMP)
-clean: $(TARGETS_CLEAN)
+# subdirectories to descend into
+$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache)
 
-squashfs-compile: lzma-install
+# builddir dependencies
+$(curdir)/squashfs/compile := $(curdir)/lzma/install
 
-ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
-  $(STAMP): $(TARGETS_INSTALL)
-endif
+# 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
+endef
+$(eval $(call copy_include,$(curdir)))
 
-$(STAMP):
-	mkdir -p $(shell dirname $@)
-	touch $@
-	
-$(STAGING_DIR)/include-host:
-	@mkdir -p $@
-	@$(CP) ./include/*.h $@/
+# prerequisites for the individual targets
+$(curdir)/ := .config
+$(curdir)//compile = $(1)/prepare
+$(curdir)//install = $(1)/compile
 
-$(TOOL_BUILD_DIR):
-	@mkdir -p $@
-
-$(eval $(call default_subtargets,$(STAGING_DIR)/include-host $(TOOL_BUILD_DIR)))
-
-ifeq ($(MAKECMDGOALS),install-targets)
-MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
-else
-.NOTPARALLEL:
-endif
+$(eval $(call stampfile,$(curdir),tools))
+$(eval $(call subdir,$(curdir)))