fix ipset compile with 2.6.22-rc4

[openwrt.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index c8fad23..265c6ae 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,54 +7,54 @@
 # 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-$(CONFIG_CCACHE) += ccache

 
 TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
 TARGETS_PREPARE:=$(patsubst %,%-prepare,$(TARGETS-y))
 
 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))
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))

+STAMP:=$(STAGING_DIR)/stampfiles/.tools_installed

 
 all: install
 download: $(TARGETS_DOWNLOAD)
 
 all: install
 download: $(TARGETS_DOWNLOAD)

-install: $(TARGETS_INSTALL)
+compile: $(TARGETS_COMPILE)
+install: $(STAMP)

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

-TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles
+ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
+  $(STAMP): $(TARGETS_INSTALL)
+endif

 
 

-$(TOOL_STAMP_DIR):
-       mkdir -p $@
+$(STAMP): $(TOPDIR)/.config
+       mkdir -p $(shell dirname $@)
+       touch $@

 
 

-$(STAGING_DIR)/include-host:
-       @mkdir -p $@
-       @$(CP) ./include/*.h $@/
+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 $@
 
 
 $(TOOL_BUILD_DIR):
        @mkdir -p $@
 

-%-download: FORCE
-       $(MAKE) -C $(patsubst %-download,%,$@) download
-
-%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR) FORCE
-       @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
-               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
-       }
-       @touch $(TOOL_STAMP_DIR)/.tool_$@
-
-%-compile: %-prepare 
-       @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
-               $(MAKE) -C $(patsubst %-compile,%,$@) compile; \
-       }
-       @touch $(TOOL_STAMP_DIR)/.tool_$@
+%-prereq %-download %-clean %-refresh: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 

-%-install: %-compile
-       @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
-               $(MAKE) -C $(patsubst %-install,%,$@) install; \
-       }
-       @touch $(TOOL_STAMP_DIR)/.tool_$@
+%-prepare: $(TOOL_HOST_INCLUDES) $(TOOL_BUILD_DIR) FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 

-%-clean: FORCE
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-*
+%-compile: %-prepare FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)
+       
+%-install: %-compile FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 

+ifeq ($(MAKECMDGOALS),install-targets)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif