remove libgcc hack

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 28ac81c..8e26db5 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,9 +1,10 @@
 # Main makefile for the toolchain
 include $(TOPDIR)/rules.mk
-TARGETS:=sed utils binutils gcc uClibc ipkg-utils
+TARGETS-y:=sed utils binutils gcc uClibc ipkg-utils libnotimpl
+TARGETS-$(CONFIG_GDB) += gdb
 
-TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
 
 all: install
 install: $(TARGETS_INSTALL)
@@ -15,31 +16,39 @@ 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 $@
 
 $(STAGING_DIR):
-       @mkdir -p $(STAGING_DIR)/lib
-       @mkdir -p $(STAGING_DIR)/include
-       @mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-       @ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+       @mkdir -p $@/lib
+       @mkdir -p $@/include
+       @mkdir -p $@/$(REAL_GNU_TARGET_NAME)
+       @ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
 
 $(TOOL_BUILD_DIR):
-       @mkdir -p $(TOOL_BUILD_DIR)
+       @mkdir -p $@
 
-%-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) FORCE
+       @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
+               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+       }
+       @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_$@ ] || { \
+               $(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+       }
+       @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_$@ ] || { \
+               $(MAKE) -C $(patsubst %-install,%,$@) install; \
+       }
+       @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
-%-clean:
+%-clean: FORCE
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*
+       @rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*