X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2FMakefile;h=eeadde2ed622693f32d30f6f2293ce9bce6bd3b9;hb=053826c1ef378f54fdc45240a7c622f6610756c7;hp=741fd48f6af27f314e3ae1d7edee2b91632e3e03;hpb=652d9073459fce55104f0db8f64fc5b9100c979d;p=openwrt-10.03%2F.git diff --git a/tools/Makefile b/tools/Makefile index 741fd48f6..eeadde2ed 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,12 +10,15 @@ include $(TOPDIR)/rules.mk TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y)) +TARGETS_PREPARE:=$(patsubst %,%-prepare,$(TARGETS-y)) TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y)) all: install download: $(TARGETS_DOWNLOAD) -install: $(TARGETS_INSTALL) +install: + $(MAKE) install-targets +install-targets: $(TARGETS_INSTALL) clean: $(TARGETS_CLEAN) squashfs-compile: lzma-install @@ -25,13 +28,9 @@ TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles $(TOOL_STAMP_DIR): mkdir -p $@ -$(STAGING_DIR): - @mkdir -p $@/lib - @mkdir -p $@/include - @mkdir -p $@/include-host - $(CP) ./include/*.h $@/include-host/ - @ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib - @mkdir -p $@/$(REAL_GNU_TARGET_NAME) +$(STAGING_DIR)/include-host: + @mkdir -p $@ + @$(CP) ./include/*.h $@/ $(TOOL_BUILD_DIR): @mkdir -p $@ @@ -39,7 +38,7 @@ $(TOOL_BUILD_DIR): %-download: FORCE $(MAKE) -C $(patsubst %-download,%,$@) download -%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE +%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR) FORCE @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \ } @@ -61,3 +60,8 @@ $(TOOL_BUILD_DIR): @$(MAKE) -C $(patsubst %-clean,%,$@) clean @rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-* +ifeq ($(MAKECMDGOALS),install-targets) +MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) +else +.NOTPARALLEL: +endif