From c91d032e6b15131a90d357f32a2a909e2074ce68 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Tue, 3 Aug 2010 10:01:36 +0000
Subject: [PATCH] Make make's output more readable

The real command line is now hidden and instead a short message which explains
what is done is displayed. To get back the old behavior, use "make VERBOSE=1".

Thanks to DarthGandalf for this.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2094 726aef4b-f618-498e-8847-2d620e286838
---
 Makefile.in         | 26 ++++++++++++++++++++------
 man/Makefile.in     | 11 ++++++++++-
 modules/Makefile.in | 11 ++++++++++-
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6bb22d0f..391a0ecb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,6 +39,16 @@ CLEAN     := znc *.o core core.*
 DISTCLEAN := Makefile config.log config.status znc-config znc-buildmod .depend \
 	modules/.depend modules/Makefile man/Makefile znc.pc znc-uninstalled.pc
 
+ifeq "$(VERBOSE)" ""
+Q=@
+E=@echo
+C=-s
+else
+Q=
+E=@\#
+C=
+endif
+
 .PHONY: all man modules clean distclean install
 
 all: znc man modules $(LIBZNC)
@@ -55,20 +65,23 @@ ifeq "$(LIBZNC)" ""
 OBJS := $(BIN_OBJS) $(LIB_OBJS)
 
 znc: $(OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+	$(E) Linking znc...
+	$(Q)$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 else
 znc: $(BIN_OBJS) $(LIBZNC)
-	$(CXX) $(LDFLAGS) -o $@ $(BIN_OBJS) -L. -lznc -Wl,-rpath,$(LIBZNCDIR) $(LIBS)
+	$(E) Linking znc...
+	$(Q)$(CXX) $(LDFLAGS) -o $@ $(BIN_OBJS) -L. -lznc -Wl,-rpath,$(LIBZNCDIR) $(LIBS)
 
 $(LIBZNC): $(LIB_OBJS)
-	$(CXX) $(LDFLAGS) -shared -o $@ $(LIB_OBJS) $(LIBS)
+	$(E) Linking $(LIBZNC)...
+	$(Q)$(CXX) $(LDFLAGS) -shared -o $@ $(LIB_OBJS) $(LIBS)
 endif
 
 man:
-	@$(MAKE) -C man
+	@$(MAKE) -C man $(C)
 
 modules: $(LIBZNC)
-	@$(MAKE) -C modules;
+	@$(MAKE) -C modules $(C)
 
 clean:
 	rm -rf $(CLEAN)
@@ -80,7 +93,8 @@ distclean: clean
 
 %.o: %.cpp Makefile
 	@mkdir -p .depend
-	$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
+	$(E) Building $@...
+	$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
 
 install: znc $(LIBZNC)
 	mkdir -p $(DESTDIR)$(bindir)
diff --git a/man/Makefile.in b/man/Makefile.in
index e65f9da9..33f6531e 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -13,10 +13,19 @@ INSTALL_DATA := @INSTALL_DATA@
 
 MAN1        := znc.1.gz znc-buildmod.1.gz znc-config.1.gz
 
+ifeq "$(VERBOSE)" ""
+Q=@
+E=@echo
+else
+Q=
+E=@\#
+endif
+
 all: $(MAN1)
 
 %.1.gz: %.1 Makefile
-	gzip -9 <$< >$@
+	$(E) Packing man page $<...
+	$(Q)gzip -9 <$< >$@
 
 clean:
 	-rm -f $(MAN1)
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 8535763b..5fdfd87c 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -33,6 +33,14 @@ INSTALL_DATA    := @INSTALL_DATA@
 
 TCL_FLAGS:= @TCL_FLAGS@
 
+ifeq "$(VERBOSE)" ""
+Q=@
+E=@echo
+else
+Q=
+E=@\#
+endif
+
 ifneq "$(LIBZNC)" ""
 LDFLAGS += -L.. -lznc -Wl,-rpath,$(LIBZNCDIR)
 endif
@@ -111,7 +119,8 @@ clean:
 %.so: %.cpp Makefile
 	@mkdir -p .depend
 	@mkdir -p extra
-	$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))FLAGS) -MMD -MF .depend/$(notdir $@).dep
+	$(E) Building $(if $(filter %extra/,$(dir $<)),extra )module $(notdir $(basename $@))...
+	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))FLAGS) -MMD -MF .depend/$(notdir $@).dep
 
 modperl_install: create_install_dir
 	for i in $(srcdir)/*.pm; do \