X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c1fd3ab56bf3502fc9652803c590161a256bfcd5..2be847dc58145c4946781ebde7cda49ce0e5f099:/package/Makefile?ds=sidebyside

diff --git a/package/Makefile b/package/Makefile
index 0bddabbc8..1bdbbbfd8 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -442,30 +442,44 @@ $(TARGET_DIR):
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
 	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(TRACE) package/$(patsubst %-prepare,%,$@)/prepare; \
-		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+		$(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
+		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
+			touch $(STAMP_DIR)/.$@; \
+		} || { \
+			$(CMD_TRACE) " done"; \
+			$(END_TRACE); \
+		} \
 	}
-	@touch $(STAMP_DIR)/.$@
 
 %-compile:
 	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(TRACE) package/$(patsubst %-compile,%,$@)/compile; \
-		$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+		$(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \
+		$(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
+			touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
+			touch $(STAMP_DIR)/.$@; \
+		} || { \
+			$(CMD_TRACE) " done"; \
+			$(END_TRACE); \
+		} \
 	}
-	@touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare
-	@touch $(STAMP_DIR)/.$@
 
 %-install: %-compile
-	@$(TRACE) package/$(patsubst %-install,%,$@)/install
+	@$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: "
 	@$(MAKE) -C $(patsubst %-install,%,$@) install
+	@$(CMD_TRACE) " done"
+	@$(END_TRACE)
 
 %-rebuild: 
-	@$(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:
-	@$(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"
+	@$(END_TRACE)