X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=tools%2FMakefile;h=ecab9dae84fb467ac4a80db3d3ba4b7934f11f1c;hp=4ee3f1ae7e5eabd458ccf61a52c7d0076ce63ff2;hb=8d317619d3037bdcccf2a2ccbf6a982bf62515ee;hpb=0af2476ee1fe55557154de7220922ebb80fa708b diff --git a/tools/Makefile b/tools/Makefile index 4ee3f1ae7e..ecab9dae84 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,60 +1,37 @@ # -# 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 $@) +curdir:=tools + +# subdirectories to descend into +$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config $(if $(CONFIG_CCACHE),ccache) + +# builddir dependencies +$(curdir)/squashfs/compile := $(curdir)/lzma/install + +# preparatory work +$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build + @for dir in $(STAGING_DIR) $(STAGING_DIR_HOST); do ( \ + set -x; \ + mkdir -p "$$dir"; \ + cd "$$dir"; \ + mkdir -p bin lib include stamp; \ + ); done + mkdir -p $(BUILD_DIR_HOST)/stamp $(BUILD_DIR)/stamp + $(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/ touch $@ -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 $@ - -%-prereq %-download %-clean %-refresh %-update: FORCE - $(MAKE) -C $* $(patsubst $*-%,%,$@) - -%-prepare: $(TOOL_HOST_INCLUDES) $(TOOL_BUILD_DIR) FORCE - $(MAKE) -C $* $(patsubst $*-%,%,$@) +$(curdir)//prepare = $(STAGING_DIR)/.prepared +$(curdir)//compile = $(STAGING_DIR)/.prepared -%-compile: %-prepare FORCE - $(MAKE) -C $* $(patsubst $*-%,%,$@) - -%-install: %-compile FORCE - $(MAKE) -C $* $(patsubst $*-%,%,$@) +# prerequisites for the individual targets +$(curdir)/ := .config prereq +$(curdir)//install = $(1)/compile -ifeq ($(MAKECMDGOALS),install-targets) -MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) -else -.NOTPARALLEL: -endif +$(eval $(call stampfile,$(curdir),tools,install)) +$(eval $(call subdir,$(curdir)))