From 6ac35991e51182149d098c58ca8c1a73e2025b55 Mon Sep 17 00:00:00 2001
From: Josh Elsasser <josh@elsasser.org>
Date: Mon, 5 Mar 2007 03:40:05 +0000
Subject: [PATCH] Prettify the BeOS build output.

---
 mk/beos.mk   | 18 ++++++++++--------
 mk/common.mk | 28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/mk/beos.mk b/mk/beos.mk
index 554fd061d..f28f5fbf5 100644
--- a/mk/beos.mk
+++ b/mk/beos.mk
@@ -13,20 +13,22 @@ CXXFLAGS += -IlibPrefs
 LDFLAGS  += -lbe -ltracker
 LDLIBS   += ../beos/libPrefs/libPrefs.a
 
-Transmission: $(OBJS) ../beos/Transmission.rsrc
-	$(CXX) -o $@ $(OBJS) $(LDLIBS) $(LDFLAGS)
-	xres -o Transmission ../beos/Transmission.rsrc
-	mimeset -f Transmission
+Transmission: $(OBJS) ../libtransmission/libtransmission.a ../beos/Transmission.rsrc
+	$(LINK_RULE_CXX)
+	$(XRES_RULE)
+	$(MIMESET_RULE)
 
 %.o: %.cpp ../mk/config.mk ../mk/common.mk ../mk/beos.mk
-	$(CXX) $(CXXFLAGS) -o $@ -c $<
+	$(CXX_RULE)
 
 clean:
-	$(RM) Transmission $(OBJS)
+	@echo "Clean Transmission"
+	@$(RM) Transmission
+	@echo "Clean $(OBJS)"
+	@$(RM) $(OBJS)
 
 .depend: $(SRCS) ../mk/config.mk ../mk/common.mk ../mk/beos.mk
-	$(RM) .depend
-	$(foreach SRC, $(SRCS), $(CXX) $(CXXFLAGS) -MM $(SRC) >> .depend;)
+	$(DEP_RULE_CXX)
 
 install:
 	@true
diff --git a/mk/common.mk b/mk/common.mk
index e066a8fed..5fcc902f4 100644
--- a/mk/common.mk
+++ b/mk/common.mk
@@ -44,23 +44,51 @@ define DEP_RULE
 	@$(foreach SRC, $(SRCS), $(CC) -MM $(SRC) $(CFLAGS) >> .depend;)
 endef
 
+define DEP_RULE_CXX
+	@echo "Checking dependencies..."
+	@$(RM) .depend
+	@$(foreach SRC, $(SRCS), $(CXX) -MM $(SRC) $(CXXFLAGS) >> .depend;)
+endef
+
 define CC_RULE
 	@echo "Cc $@"
 	@CMD="$(CC) $(CFLAGS) -o $@ -c $<"; $$CMD || \
 	  ( echo "Compile line for $@ was:"; echo $$CMD; false )
 endef
 
+define CXX_RULE
+	@echo "C++ $@"
+	@CMD="$(CXX) $(CXXFLAGS) -o $@ -c $<"; $$CMD || \
+	  ( echo "Compile line for $@ was:"; echo $$CMD; false )
+endef
+
 define LINK_RULE
 	@echo "Link $@"
 	@CMD="$(CC) -o $@ $(OBJS) $(LDLIBS) $(LDFLAGS)"; $$CMD || \
 	  ( echo "Compile line for $@ was:"; echo $$CMD; false )
 endef
 
+define LINK_RULE_CXX
+	@echo "Link $@"
+	@CMD="$(CXX) -o $@ $(OBJS) $(LDLIBS) $(LDFLAGS)"; $$CMD || \
+	  ( echo "Compile line for $@ was:"; echo $$CMD; false )
+endef
+
 define MSGFMT_RULE
        @echo "Msgfmt $<"
        @msgfmt -f $< -o $@
 endef
 
+define XRES_RULE
+	@echo "Xres $@"
+	@xres -o $@ $@.rsrc
+endef
+
+define MIMESET_RULE
+	@echo "Mimeset $@"
+	@mimeset -f $@
+endef
+
 define INSTALL_BIN_RULE
        @echo "Install $<"
        @$(MKDIR) $(DESTDIR)$(PREFIX)/bin