X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=toolchain%2FMakefile;h=8e26db562b70fe11debdb0c3a4afac1487fb28d1;hb=06265758beb1721526360aa01176dd70d8a9e1d4;hp=c99116db6c413df103328b2693151c9881aedf5e;hpb=a345da1bda4eede9b6ac4cc6b1222e2345a698bd;p=openwrt-10.03%2F.git

diff --git a/toolchain/Makefile b/toolchain/Makefile
index c99116db6..8e26db562 100644
--- 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 gdb libnotimpl
+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)
@@ -18,40 +19,36 @@ gcc-compile: uClibc-install
 TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
 
 $(TOOLCHAIN_STAMP_DIR):
-	mkdir -p $(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: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR)
+%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
 	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-		$(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare; \
-		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare $(MAKE_TRACE); \
+		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
 	}
 	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-compile: %-prepare 
 	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-		$(TRACE) toolchain/$(patsubst %-compile,%,$@)/compile; \
-		$(MAKE) -C $(patsubst %-compile,%,$@) compile $(MAKE_TRACE); \
+		$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
 	}
 	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
 %-install: %-compile
 	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
-		$(TRACE) toolchain/$(patsubst %-install,%,$@)/install; \
-		$(MAKE) -C $(patsubst %-install,%,$@) install $(MAKE_TRACE); \
+		$(MAKE) -C $(patsubst %-install,%,$@) install; \
 	}
 	@touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
 
-%-clean:
-	$(TRACE) toolchain/$(patsubst %-clean,%,$@)/clean
-	@$(MAKE) -C $(patsubst %-clean,%,$@) clean $(MAKE_TRACE)
+%-clean: FORCE
+	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
 	@rm -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$(patsubst %-clean,%,$@)-*