From 86069500797dc6b15c12ee5fc3c3df3804be22d8 Mon Sep 17 00:00:00 2001
From: Scott Wood <scott@thor.buserror.net>
Date: Sun, 23 Mar 2008 18:40:57 -0500
Subject: [PATCH] Makefiles: Add Linux-style V=1 support

Signed-off-by: Scott Wood <scott@thor.buserror.net>
---
 Makefile.head |  5 +++++
 Makefile.tail | 62 +++++++++++++++++++++++++--------------------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/Makefile.head b/Makefile.head
index 61456a0..e366517 100644
--- a/Makefile.head
+++ b/Makefile.head
@@ -50,6 +50,11 @@ WARN += -Wall -Werror
 OPT += -O2
 DEBUG += -g3
 ABI += -freg-struct-return
+ifeq ($(V),)
+	V := @
+else
+	override V := 
+endif
 
 CXXFLAGS += $(DEFS) $(CXXINCS) $(CXXWARN) $(OPT) $(DEBUG) $(ABI)
 BUILDCXXFLAGS += $(BUILDDEFS) $(CXXWARN) $(OPT) $(DEBUG)
diff --git a/Makefile.tail b/Makefile.tail
index bc5baca..d7cb228 100644
--- a/Makefile.tail
+++ b/Makefile.tail
@@ -31,53 +31,53 @@ BUILDSRCS := $(BUILDCFILES:%=%.c) $(BUILDCXXFILES:%=%.cc)
 
 $(ASOBJS): $(BUILDDIR)/%.o: %.S
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(CC) $(ASFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(CC) $(ASFLAGS) -c -o "$@" "$<"
 
 $(COBJS): $(BUILDDIR)/%.o: %.c
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(CC) $(CFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(CC) $(CFLAGS) -c -o "$@" "$<"
 
 $(CXXOBJS): $(BUILDDIR)/%.o: %.cc
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(CXX) $(CXXFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(CXX) $(CXXFLAGS) -c -o "$@" "$<"
 
 $(GENASOBJS): %.o: %.S
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(CC) $(ASFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(CC) $(ASFLAGS) -c -o "$@" "$<"
 
 $(GENCOBJS): %.o: %.c
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(CC) $(CFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(CC) $(CFLAGS) -c -o "$@" "$<"
 
 $(GENCXXOBJS): %.o: %.cc
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(CXX) $(CXXFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(CXX) $(CXXFLAGS) -c -o "$@" "$<"
 
 $(BUILDCOBJS): $(BUILDDIR)/%.o: %.c
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(BUILDCC) $(BUILDCFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(BUILDCC) $(BUILDCFLAGS) -c -o "$@" "$<"
 
 $(BUILDCXXOBJS): $(BUILDDIR)/%.o: %.cc
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(BUILDCXX) $(BUILDCXXFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(BUILDCXX) $(BUILDCXXFLAGS) -c -o "$@" "$<"
 
 $(BUILDGENCOBJS): %.o: %.c
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(BUILDCC) $(BUILDCFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(BUILDCC) $(BUILDCFLAGS) -c -o "$@" "$<"
 
 $(BUILDGENCXXOBJS): %.o: %.cc
 	@echo $(COMP): "$<"
-	@$(MKDIR) $(dir $@)
-	@$(BUILDCXX) $(BUILDCXXFLAGS) -c -o "$@" "$<"
+	$(V)$(MKDIR) $(dir $@)
+	$(V)$(BUILDCXX) $(BUILDCXXFLAGS) -c -o "$@" "$<"
 
 clean: $(EXTRACLEAN)
 	$(RM) $(foreach dir,$(DIRS),$(BUILDDIR)/$(dir)*.o)
@@ -96,8 +96,8 @@ SERVERS := $(SERVERS:%.cdl=%)
 
 $(SERVERS:%=$(SERVERDIR)/%): $(SERVERDIR)/%: %.cdl $(IFACES)
 	@echo $(COMP): "$<"
-	@$(RMDIR) "$@"
-	@if ! $(IDLC) -t $(ARCH) -l c++ -r -i "$(IFACES)" -o "$@" "$<"; then \
+	$(V)$(RMDIR) "$@"
+	$(V)if ! $(IDLC) -t $(ARCH) -l c++ -r -i "$(IFACES)" -o "$@" "$<"; then \
 		$(RMDIR) "$@"; \
 		false; \
 	fi
@@ -110,26 +110,26 @@ servers: $(SERVERS:%=$(SERVERDIR)/%)
 ifneq ($(NODEPS),y)
 dep: servers $(PREDEP) 
 	@echo $(COMP): Generating dependencies
-	@$(RM) "$(BUILDDIR)"/.depend
-	@$(MKDIR) "$(BUILDDIR)"
-	@$(TOUCH) "$(BUILDDIR)"/.depend
-	@for i in $(SRCS); do if [ -f "$$i" ]; then \
+	$(V)$(RM) "$(BUILDDIR)"/.depend
+	$(V)$(MKDIR) "$(BUILDDIR)"
+	$(V)$(TOUCH) "$(BUILDDIR)"/.depend
+	$(V)for i in $(SRCS); do if [ -f "$$i" ]; then \
 		OBJ=`echo "$$i" | sed s/\\.\[^.\]*$$//`.o; \
 		$(CXX) $(CXXFLAGS) -DMAKEDEP -M -MT "$(BUILDDIR)/$$OBJ" "$$i" >> "$(BUILDDIR)"/.depend; \
 	fi; done
-	@for i in $(GENSRCS); do if [ -f "$$i" ]; then \
+	$(V)for i in $(GENSRCS); do if [ -f "$$i" ]; then \
 		OBJ=`echo "$$i" | sed s/\\.\[^.\]*$$//`.o; \
 		$(CXX) $(CXXFLAGS) -DMAKEDEP -M -MT "$$OBJ" "$$i" >> "$(BUILDDIR)"/.depend; \
 	fi; done
-	@for i in $(BUILDSRCS); do if [ -f "$$i" ]; then \
+	$(V)for i in $(BUILDSRCS); do if [ -f "$$i" ]; then \
 		OBJ=`echo "$$i" | sed s/\\.\[^.\]*$$//`.o; \
 		$(BUILDCXX) $(BUILDCXXFLAGS) -DMAKEDEP -M -MT "$(BUILDDIR)/$$OBJ" "$$i" >> "$(BUILDDIR)"/.depend; \
 	fi; done
-	@for i in $(BUILDGENSRCS); do if [ -f "$$i" ]; then \
+	$(V)for i in $(BUILDGENSRCS); do if [ -f "$$i" ]; then \
 		OBJ=`echo "$$i" | sed s/\\.\[^.\]*$$//`.o; \
 		$(BUILDCXX) $(BUILDCXXFLAGS) -DMAKEDEP -M -MT "$$OBJ" "$$i" >> "$(BUILDDIR)"/.depend; \
 	fi; done
-	@for i in $(SERVERS); do \
+	$(V)for i in $(SERVERS); do \
 		$(IDLC) -M -l c++ -r -i "$(IFACES)" -o "$(SERVERDIR)/$$i" \
 		"$$i.cdl" >> "$(BUILDDIR)"/.depend; \
 	done
@@ -141,7 +141,7 @@ include $(BUILDDIR)/.depend
 default: $(TARGETS)
 else
 rerun: dep
-	@$(MAKE)
+	$(V)$(MAKE)
 
 default: rerun
 endif
-- 
2.39.2