add extra safety for linksys nvram fixup (should fix #56, though i haven't been able...

[openwrt.git] / openwrt / toolchain / Makefile

diff --git a/openwrt/toolchain/Makefile b/openwrt/toolchain/Makefile
index c573deb..c99116d 100644 (file)
--- a/openwrt/toolchain/Makefile
+++ b/openwrt/toolchain/Makefile
@@ -1,6 +1,6 @@
 # Main makefile for the toolchain
 include $(TOPDIR)/rules.mk
-TARGETS:=sed utils binutils gcc uClibc ipkg-utils gdb
+TARGETS:=sed utils binutils gcc uClibc ipkg-utils gdb libnotimpl
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
@@ -15,8 +15,10 @@ gcc-prepare: binutils-install
 uClibc-compile: gcc-prepare
 gcc-compile: uClibc-install
 
-$(STAMP_DIR):
-       mkdir -p $(STAMP_DIR)
+TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
+
+$(TOOLCHAIN_STAMP_DIR):
+       mkdir -p $(TOOLCHAIN_STAMP_DIR)
 
 $(STAGING_DIR):
        @mkdir -p $(STAGING_DIR)/lib
@@ -27,19 +29,29 @@ $(STAGING_DIR):
 $(TOOL_BUILD_DIR):
        @mkdir -p $(TOOL_BUILD_DIR)
 
-%-prepare: $(STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
-       @[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-       @touch $(STAMP_DIR)/.toolchain_$@
+%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
+       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+               $(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare; \
+               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare $(MAKE_TRACE); \
+       }
+       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-compile: %-prepare 
-       @[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
-       @touch $(STAMP_DIR)/.toolchain_$@
+       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+               $(TRACE) toolchain/$(patsubst %-compile,%,$@)/compile; \
+               $(MAKE) -C $(patsubst %-compile,%,$@) compile $(MAKE_TRACE); \
+       }
+       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-install: %-compile
-       @[ -f $(STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
-       @touch $(STAMP_DIR)/.toolchain_$@
+       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+               $(TRACE) toolchain/$(patsubst %-install,%,$@)/install; \
+               $(MAKE) -C $(patsubst %-install,%,$@) install $(MAKE_TRACE); \
+       }
+       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-clean:
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
+       $(TRACE) toolchain/$(patsubst %-clean,%,$@)/clean
+       @$(MAKE) -C $(patsubst %-clean,%,$@) clean $(MAKE_TRACE)
+       @rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*