use . /var/state/network instead of config_load to avoid a CONFIG_SECTIONS reset

[openwrt.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index d03ab38..68e7dab 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,8 @@
 # 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 firmware-utils
+TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline
+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))


@@ -28,18 +29,29 @@ ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p . $(STAMP)),$(STAMP))
   $(STAMP): $(TARGETS_INSTALL)
 endif
 
   $(STAMP): $(TARGETS_INSTALL)
 endif
 

-$(STAMP):
+$(STAMP): $(TOPDIR)/.config

        mkdir -p $(shell dirname $@)
        touch $@
        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 $@
 

-$(eval $(call default_subtargets,$(STAGING_DIR)/include-host $(TOOL_BUILD_DIR)))
+%-prereq %-download %-clean %-refresh %-update: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+%-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)