include .pkginfo in image builder

[openwrt.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index c8fad23..f8f0878 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,7 @@
 # Main makefile for the host tools
 #
 include $(TOPDIR)/rules.mk
 # Main makefile for the host tools
 #
 include $(TOPDIR)/rules.mk

-TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage
+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_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
 TARGETS_PREPARE:=$(patsubst %,%-prepare,$(TARGETS-y))


@@ -16,7 +16,9 @@ TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
 
 all: install
 download: $(TARGETS_DOWNLOAD)
 
 all: install
 download: $(TARGETS_DOWNLOAD)

-install: $(TARGETS_INSTALL)
+install: 
+       $(MAKE) install-targets
+install-targets: $(TARGETS_INSTALL)

 clean: $(TARGETS_CLEAN)
 
 squashfs-compile: lzma-install
 clean: $(TARGETS_CLEAN)
 
 squashfs-compile: lzma-install


@@ -58,3 +60,8 @@ $(TOOL_BUILD_DIR):
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
        @rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-*
 
        @$(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