remove custom partition table hack, add ptgen utility for generating partition tables

[openwrt-10.03/.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 21d6a94f9ade1ed96fd8bea8d6a53a1234957944..f8f08781b5380e23f9d02a681a53ec6f23e64eb1 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,15 +7,18 @@
 # 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_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,11 +28,9 @@ TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles
 $(TOOL_STAMP_DIR):
        mkdir -p $@
 
-$(STAGING_DIR):
-       @mkdir -p $@/lib
-       @mkdir -p $@/include
-       @mkdir -p $@/$(REAL_GNU_TARGET_NAME)
-       @ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
+$(STAGING_DIR)/include-host:
+       @mkdir -p $@
+       @$(CP) ./include/*.h $@/
 
 $(TOOL_BUILD_DIR):
        @mkdir -p $@
@@ -37,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; \
        }
@@ -59,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