fix ipset compile with 2.6.22-rc4

[openwrt.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 9c31554..265c6ae 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -32,17 +32,26 @@ endif
 $(STAMP): $(TOPDIR)/.config
        mkdir -p $(shell dirname $@)
        touch $@
 $(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 $@
 

-$(TARGETS_COMPILE) $(TARGETS_INSTALL): $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR)
+%-prereq %-download %-clean %-refresh: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 

-$(eval $(call default_subtargets,))
+%-prepare: $(TOOL_HOST_INCLUDES) $(TOOL_BUILD_DIR) FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+%-compile: %-prepare FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)
+       
+%-install: %-compile FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 ifeq ($(MAKECMDGOALS),install-targets)
 MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
 
 ifeq ($(MAKECMDGOALS),install-targets)
 MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)