remove references to /usr in libpng*-config, standardize.

[openwrt.git] / openwrt / toolchain / Makefile

diff --git a/openwrt/toolchain/Makefile b/openwrt/toolchain/Makefile
index c56f263..c99116d 100644 (file)
--- a/openwrt/toolchain/Makefile
+++ b/openwrt/toolchain/Makefile
@@ -1,6 +1,6 @@
 # Main makefile for the toolchain
 include $(TOPDIR)/rules.mk
 # Main makefile for the toolchain
 include $(TOPDIR)/rules.mk

-TARGETS:=sed utils binutils gcc uClibc ipkg-utils gdb libmissing
+TARGETS:=sed utils binutils gcc uClibc ipkg-utils gdb libnotimpl

 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))


@@ -30,18 +30,28 @@ $(TOOL_BUILD_DIR):
        @mkdir -p $(TOOL_BUILD_DIR)
 
 %-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
        @mkdir -p $(TOOL_BUILD_DIR)
 
 %-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)

-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
+       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+               $(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare; \
+               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare $(MAKE_TRACE); \
+       }

        @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-compile: %-prepare 
        @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-compile: %-prepare 

-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
+       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+               $(TRACE) toolchain/$(patsubst %-compile,%,$@)/compile; \
+               $(MAKE) -C $(patsubst %-compile,%,$@) compile $(MAKE_TRACE); \
+       }

        @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-install: %-compile
        @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-install: %-compile

-       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
+       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+               $(TRACE) toolchain/$(patsubst %-install,%,$@)/install; \
+               $(MAKE) -C $(patsubst %-install,%,$@) install $(MAKE_TRACE); \
+       }

        @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-clean:
        @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-clean:

-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
+       $(TRACE) toolchain/$(patsubst %-clean,%,$@)/clean
+       @$(MAKE) -C $(patsubst %-clean,%,$@) clean $(MAKE_TRACE)

        @rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
 
        @rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*