fix trace targets to actually display correct target names
fix trace targets to actually display correct target names


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2970 3c298f89-4303-0410-b956-a3cf2f4a3e73

--- a/package/Makefile
+++ b/package/Makefile
@@ -514,7 +514,7 @@
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
 	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
+		$(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
 			touch $(STAMP_DIR)/.$@; \
 			$(CMD_TRACE) " done"; \
@@ -524,7 +524,7 @@
 
 %-compile:
 	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \
+		$(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
 		$(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
 			touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
 			touch $(STAMP_DIR)/.$@; \
@@ -534,20 +534,20 @@
 	}
 
 %-install: %-compile
-	@$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: "
+	@$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
 	@$(MAKE) -C $(patsubst %-install,%,$@) install
 	@$(CMD_TRACE) " done"
 	@$(END_TRACE)
 
 %-rebuild: 
-	@$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)/rebuild: "
+	@$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
 	@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
 	$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 	@$(CMD_TRACE) " done"
 	@$(END_TRACE)
 
 %-clean:
-	@$(START_TRACE) "package/$(patsubst %-clean,%,$@)/clean: "
+	@$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
 	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
 	@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
 	@$(CMD_TRACE) " done"

--- a/target/Makefile
+++ b/target/Makefile
@@ -17,19 +17,19 @@
 	rm -f $(BIN_DIR)/openwrt-*
 
 %-clean:
-	@$(TRACE) target/$(patsubst %-clean,%,$@)/clean
+	@$(TRACE) target/$(patsubst %-clean,%,$@)-clean
 	$(MAKE) -C $(patsubst %-clean,%,$@) clean
 %-prepare:
-	@$(TRACE) target/$(patsubst %-prepare,%,$@)/prepare
+	@$(TRACE) target/$(patsubst %-prepare,%,$@)-prepare
 	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
-	@$(TRACE) target/$(patsubst %-compile,%,$@)/compile
+	@$(TRACE) target/$(patsubst %-compile,%,$@)-compile
 	$(MAKE) -C $(patsubst %-compile,%,$@) compile
 %-rebuild: 
-	@$(TRACE) target/$(patsubst %-rebuild,%,$@)/rebuild
+	@$(TRACE) target/$(patsubst %-rebuild,%,$@)-rebuild
 	$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
-	@$(TRACE) target/$(patsubst %-install,%,$@)/install
+	@$(TRACE) target/$(patsubst %-install,%,$@)-install
 	$(MAKE) -C $(patsubst %-install,%,$@) install
 linux-imagebuilder:
 	@$(TRACE) target/linux/imagebuilder

--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,31 +9,31 @@
 define kernel_template
 
 $(1)/$(2)-clean:
-	@$(TRACE) target/linux/$(2)-$(1)/clean
+	@$(TRACE) target/linux/$(2)-$(1)-clean
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	@$(TRACE) target/linux/$(2)-$(1)/prepare
+	@$(TRACE) target/linux/$(2)-$(1)-prepare
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	@$(TRACE) target/linux/$(2)-$(1)/compile
+	@$(TRACE) target/linux/$(2)-$(1)-compile
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	@$(TRACE) target/linux/$(2)-$(1)/rebuild
+	@$(TRACE) target/linux/$(2)-$(1)-rebuild
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	@$(TRACE) target/linux/$(2)-$(1)/install
+	@$(TRACE) target/linux/$(2)-$(1)-install
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-	@$(TRACE) target/linux/image/install
+	@$(TRACE) target/linux/image-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
-	@$(TRACE) target/linux/image/install-ib
+	@$(TRACE) target/linux/image-install-ib
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
@@ -74,10 +74,10 @@
 endif
 
 prepare:
-	@$(TRACE) target/linux/image/prepare
+	@$(TRACE) target/linux/image-prepare
 	$(MAKE) -C image prepare
 compile:
-	@$(TRACE) target/linux/image/compile
+	@$(TRACE) target/linux/image-compile
 	$(MAKE) -C image compile
 install:
 rebuild:

--- a/target/linux/image/Makefile
+++ b/target/linux/image/Makefile
@@ -24,13 +24,13 @@
 .PHONY: prepare compile install
 
 $(BOARD)-compile:
-	@$(TRACE) target/linux/image/$(BOARD)/prepare
+	@$(TRACE) target/linux/image/$(BOARD)-prepare
 	$(MAKE) -C $(BOARD) prepare
-	@$(TRACE) target/linux/image/$(BOARD)/compile
+	@$(TRACE) target/linux/image/$(BOARD)-compile
 	$(MAKE) -C $(BOARD) compile
 
 install-ib:
-	@$(TRACE) target/linux/image/$(BOARD)/install-ib
+	@$(TRACE) target/linux/image/$(BOARD)-install-ib
 	-$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib
 	mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
 	cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/	

--- a/target/linux/kernel.mk
+++ b/target/linux/kernel.mk
@@ -58,7 +58,7 @@
 $(STAMP_DIR)/.linux-compile:
 	@$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
 	ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
-	@$(TRACE) target/linux/package/compile
+	@$(TRACE) target/linux/package-compile
 	$(MAKE) -C $(TOPDIR)/target/linux/package \
 		$(KPKG_MAKEOPTS) \
 		compile
@@ -92,7 +92,7 @@
 compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile
-	@$(TRACE) target/linux/package/install
+	@$(TRACE) target/linux/package-install
 	$(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
 	$(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 

comments