Re: [MPlayer-dev-eng] [PATCH] shorten make output

[Evgeniy Stepanov <eugeni.stepanov@xxxxxxxxx>]

Another edition of the patch. Several lines are still printed as they were, 
but they are small and appear only once in a build.

This mode is now disabled by default. Can be controlled by configure 
option --enable-quiet and make V=1 (V=0).

diff --git a/Makefile b/Makefile
index d5a11d9..0f65437 100644
--- a/Makefile
+++ b/Makefile
@@ -698,22 +698,66 @@ PARTS = libavcodec \
 
 ###### generic rules #######
 
+# override configure setting
+ifeq ($(V),0)
+  quiet = QUIET_
+endif
+ifeq ($(V),1)
+  quiet =
+endif
+
+export quiet
+
 all: $(ALL_PRG)
 
+QUIET_CMD_DEPEND = "  DEPEND  $@"
+      CMD_DEPEND = $(MPDEPEND_CMD) > $@
+
+QUIET_CMD_DEPEND_CXX = "  DEPEND  $@"
+      CMD_DEPEND_CXX = $(MPDEPEND_CMD_CXX) > $@
+
+QUIET_CMD_CC = "  CC      $@"
+      CMD_CC = $(CC) $(CFLAGS) -c -o $@ $<
+
+QUIET_CMD_CC_H = "  CC(H)   $@"
+      CMD_CC_H = $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
+
+QUIET_CMD_CXX = "  CXX     $@"
+      CMD_CXX = $(CC) $(CXXFLAGS) -c -o $@ $<
+
+QUIET_CMD_LINK_MP = "  LINK    $@"
+      CMD_LINK_MP = $(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
+
+QUIET_CMD_LINK_ME = "  LINK    $@"
+      CMD_LINK_ME = $(CC) -o $@ $^ $(LDFLAGS_MENCODER)
+
 %.d: %.c
-	$(MPDEPEND_CMD) > $@
+	@echo $($(quiet)CMD_DEPEND)
+	@$(CMD_DEPEND)
 
 %.d: %.cpp
-	$(MPDEPEND_CMD_CXX) > $@
+	@echo $($(quiet)CMD_DEPEND_CXX)
+	@$(CMD_DEPEND_CXX)
 
 %.d: %.m
-	$(MPDEPEND_CMD) > $@
+	@echo $($(quiet)CMD_DEPEND)
+	@$(CMD_DEPEND)
+
+%.o: %.c
+	@echo $($(quiet)CMD_CC)
+	@$(CMD_CC)
+
+%.o: %.cpp
+	@echo $($(quiet)CMD_CXX)
+	@$(CMD_CXX)
 
 %.o: %.m
-	$(CC) $(CFLAGS) -c -o $@ $<
+	@echo $($(quiet)CMD_CC)
+	@$(CMD_CC)
 
 %.ho: %.h
-	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
+	@echo $($(quiet)CMD_CC_H)
+	@$(CMD_CC_H)
 
 ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
 checkheaders: $(ALLHEADERS:.h=.ho)
@@ -729,10 +773,12 @@ endef
 $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE)))
 
 mplayer$(EXESUF): $(MPLAYER_DEPS)
-	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
+	@echo $($(quiet)CMD_LINK_MP)
+	@$(CMD_LINK_MP)
 
 mencoder$(EXESUF): $(MENCODER_DEPS)
-	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
+	@echo $($(quiet)CMD_LINK_ME)
+	@$(CMD_LINK_ME)
 
 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
 	$(HOST_CC) -O -I. -DCODECS2HTML $< -o $@
diff --git a/common.mak b/common.mak
index 88a816e..3a9e134 100644
--- a/common.mak
+++ b/common.mak
@@ -14,23 +14,38 @@ ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
          -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) $(OPTFLAGS)
 
+QUIET_CMD_DEPEND = "  DEPEND  $(SRC_DIR)/$@"
+      CMD_DEPEND = $(DEPEND_CMD) > $@
+
+QUIET_CMD_CC = "  CC      $(SRC_DIR)/$@"
+      CMD_CC = $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+
+QUIET_CMD_CC_H = "  CC(H)   $(SRC_DIR)/$@"
+      CMD_CC_H = $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
+
 %.o: %.c
-	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+	@echo $($(quiet)CMD_CC)
+	@$(CMD_CC)
 
 %.o: %.S
-	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+	@echo $($(quiet)CMD_CC)
+	@$(CMD_CC)
 
 %.ho: %.h
-	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
+	@echo $($(quiet)CMD_CC_H)
+	@$(CMD_CC_H)
 
 %.d: %.c
-	$(DEPEND_CMD) > $@
+	@echo $($(quiet)CMD_DEPEND)
+	@$(CMD_DEPEND)
 
 %.d: %.S
-	$(DEPEND_CMD) > $@
+	@echo $($(quiet)CMD_DEPEND)
+	@$(CMD_DEPEND)
 
 %.d: %.cpp
-	$(DEPEND_CMD) > $@
+	@echo $($(quiet)CMD_DEPEND)
+	@$(CMD_DEPEND)
 
 %$(EXESUF): %.c
 
diff --git a/configure b/configure
index c6d649d..ba14301 100755
--- a/configure
+++ b/configure
@@ -812,6 +812,12 @@ for ac_option do
   --disable-debug)
     _debug=
     ;;
+  --enable-quiet)
+    _quiet='QUIET_'
+    ;;
+  --disable-quiet)
+    _quiet=
+    ;;
   --enable-runtime-cpudetection)    _runtime_cpudetection=yes   ;;
   --disable-runtime-cpudetection)   _runtime_cpudetection=no    ;;
   --enable-cross-compile)           _cross_compile=yes          ;;
@@ -7775,6 +7781,8 @@ DEPEND_CMD   = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]
 MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
 MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
 
+quiet = $_quiet
+
 EOF
 
 #############################################################################
diff --git a/subdir.mak b/subdir.mak
index 68850c8..308cfc2 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -10,10 +10,12 @@ all: $(SUBDIR)$(LIBNAME)
 
 install-libs: install-lib$(NAME)-static
 
+QUIET_CMD_AR = "  AR      $(SRC_DIR)/$@"
+      CMD_AR = rm -f $@ && $(AR) rc $@ $^ $(EXTRAOBJS) && $(RANLIB) $@
+
 $(SUBDIR)$(LIBNAME): $(OBJS)
-	rm -f $@
-	$(AR) rc $@ $^ $(EXTRAOBJS)
-	$(RANLIB) $@
+	@echo $($(quiet)CMD_AR)
+	@$(CMD_AR)
 endif
 
 INCINSTDIR := $(INCDIR)/lib$(NAME)

_______________________________________________
MPlayer-dev-eng mailing list
MPlayer-dev-eng@xxxxxxxxxxxx
https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng