[Qemacs-commit] qemacs Makefile libqhtml/Makefile

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/05/30 21:31:47

Modified files:
        .              : Makefile 
        libqhtml       : Makefile 

Log message:
        improve make output
        
        * produce less verbose make output 
        * use `make V=1` or `make VERBOSE=1` to produce full output

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/Makefile?cvsroot=qemacs&r1=1.7&r2=1.8

Patches:
Index: Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/Makefile,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- Makefile    30 May 2014 19:59:42 -0000      1.67
+++ Makefile    30 May 2014 21:31:46 -0000      1.68
@@ -21,6 +21,14 @@
 
 include $(DEPTH)/config.mak
 
+ifeq (,$(V)$(VERBOSE))
+    echo  := @echo
+    cmd   := @
+else
+    echo  := @:
+    cmd   := 
+endif
+
 ifeq ($(CC),gcc)
   CFLAGS   += -Wall -g -O2 -funsigned-char
   # do not warn about zero-length formats.
@@ -179,28 +187,30 @@
        $(MAKE) -C libqhtml all
 
 qe_g$(EXE): $(OBJS) $(DEP_LIBS)
-       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+       $(echo) LD $@
+       $(cmd)  $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 qe$(EXE): qe_g$(EXE) Makefile
-       rm -f $@
+       @rm -f $@
        cp $< $@
        -$(STRIP) $@
        @ls -l $@
-       echo `size address@hidden `wc -c address@hidden qe $(OPTIONS) \
+       @echo `size address@hidden `wc -c address@hidden qe $(OPTIONS) \
                | cut -d ' ' -f 7-10,13,15-40 >> STATS
 
 #
 # Tiny version of QEmacs
 #
 tqe_g$(EXE): $(TOBJS)
-       $(CC) $(TLDFLAGS) -o $@ $^ $(TLIBS)
+       $(echo) LD $@
+       $(cmd)  $(CC) $(TLDFLAGS) -o $@ $^ $(TLIBS)
 
 tqe$(EXE): tqe_g$(EXE) Makefile
-       rm -f $@
+       @rm -f $@
        cp $< $@
        -$(STRIP) $@
        @ls -l $@
-       echo `size address@hidden `wc -c address@hidden tqe $(OPTIONS) \
+       @echo `size address@hidden `wc -c address@hidden tqe $(OPTIONS) \
                | cut -d ' ' -f 7-10,13,15-40 >> STATS
 
 ffplay$(EXE): qe$(EXE) Makefile
@@ -234,16 +244,20 @@
 $(TOBJS_DIR)/qfribidi.o: qfribidi.c qfribidi.h
 
 $(OBJS_DIR)/%.o: %.c $(DEPENDS) Makefile
-       $(CC) $(DEFINES) $(CFLAGS) -o $@ -c $<
+       $(echo) CC -c $<
+       $(cmd)  $(CC) $(DEFINES) $(CFLAGS) -o $@ -c $<
 
 $(TOBJS_DIR)/%.o: %.c $(DEPENDS) Makefile
-       $(CC) $(DEFINES) -DCONFIG_TINY $(CFLAGS) -o $@ -c $<
+       $(echo) CC -DCONFIG_TINY -c $<
+       $(cmd)  $(CC) $(DEFINES) -DCONFIG_TINY $(CFLAGS) -o $@ -c $<
 
 $(OBJS_DIR)/haiku.o: haiku.cpp $(DEPENDS) Makefile
-       g++ $(DEFINES) $(CFLAGS) -Wno-multichar -o $@ -c $<
+       $(echo) CPP -c $<
+       $(cmd)  g++ $(DEFINES) $(CFLAGS) -Wno-multichar -o $@ -c $<
 
 $(TOBJS_DIR)/haiku.o: haiku.cpp $(DEPENDS) Makefile
-       g++ $(DEFINES) -DCONFIG_TINY $(CFLAGS) -Wno-multichar -o $@ -c $<
+       $(echo) CPP -DCONFIG_TINY -c $<
+       $(cmd)  g++ $(DEFINES) -DCONFIG_TINY $(CFLAGS) -Wno-multichar -o $@ -c 
$<
 
 %.s: %.c $(DEPENDS) Makefile
        $(CC) $(DEFINES) $(CFLAGS) -o $@ -S $<
@@ -255,13 +269,15 @@
 # Test for bidir algorithm
 #
 qfribidi$(EXE): qfribidi.c cutils.c
-       $(HOST_CC) $(CFLAGS) -DTEST -o $@ $^
+       $(echo) CC -o $@ $^
+       $(cmd)  $(HOST_CC) $(CFLAGS) -DTEST -o $@ $^
 
 #
 # build ligature table
 #
 ligtoqe$(EXE): ligtoqe.c cutils.c
-       $(HOST_CC) $(CFLAGS) -o $@ $^
+       $(echo) CC -o $@ $^
+       $(cmd)  $(HOST_CC) $(CFLAGS) -o $@ $^
 
 ifdef BUILD_ALL
 ligatures: ligtoqe$(EXE) unifont.lig
@@ -288,7 +304,8 @@
 KMAPS:=$(addprefix $(KMAPS_DIR)/, $(KMAPS))
 
 kmaptoqe$(EXE): kmaptoqe.c cutils.c
-       $(HOST_CC) $(CFLAGS) -o $@ $^
+       $(echo) CC -o $@ $^
+       $(cmd)  $(HOST_CC) $(CFLAGS) -o $@ $^
 
 ifdef BUILD_ALL
 kmaps: kmaptoqe$(EXE) $(KMAPS) Makefile
@@ -314,10 +331,12 @@
 JIS:=$(addprefix cp/,$(JIS))
 
 cptoqe$(EXE): cptoqe.c cutils.c
-       $(HOST_CC) $(CFLAGS) -o $@ $^
+       $(echo) CC $^
+       $(cmd)  $(HOST_CC) $(CFLAGS) -o $@ $^
 
 jistoqe$(EXE): jistoqe.c cutils.c
-       $(HOST_CC) $(CFLAGS) -o $@ $^
+       $(echo) CC $^
+       $(cmd)  $(HOST_CC) $(CFLAGS) -o $@ $^
 
 ifdef BUILD_ALL
 charsetmore.c: cp/cpdata.txt $(CP) cptoqe$(EXE) Makefile
@@ -337,7 +356,8 @@
 FONTS:=$(addprefix fonts/,$(FONTS))
 
 fbftoqe$(EXE): fbftoqe.c cutils.c
-       $(HOST_CC) $(CFLAGS) -o $@ $^
+       $(echo) CC -o $@ $^
+       $(cmd)  $(HOST_CC) $(CFLAGS) -o $@ $^
 
 fbffonts.c: fbftoqe$(EXE) $(FONTS)
        ./fbftoqe $(FONTS) > $@
@@ -353,8 +373,8 @@
 OBJS1:=$(addprefix $(OBJS_DIR)/, $(OBJS1))
 
 html2png$(EXE): $(OBJS1) libqhtml/libqhtml.a
-       $(CC) $(LDFLAGS) -o $@ $(OBJS1) \
-                   -L./libqhtml -lqhtml $(HTMLTOPPM_LIBS)
+       $(echo) LD $@
+       $(cmd)  $(CC) $(LDFLAGS) -o $@ $(OBJS1) -L./libqhtml -lqhtml 
$(HTMLTOPPM_LIBS)
 
 # autotest target
 test:
@@ -363,10 +383,10 @@
 # documentation
 qe-doc.html: qe-doc.texi Makefile
        LANGUAGE=en_US LC_ALL=en_US.UTF-8 texi2html -monolithic $<
-       mv $@ address@hidden
-       sed "s/This document was generated on.*//"     < address@hidden | \
+       @mv $@ address@hidden
+       @sed "s/This document was generated on.*//"     < address@hidden | \
        sed "s/<!-- Created on .* by/<!-- Created by/" > $@
-       rm address@hidden
+       @rm address@hidden
 
 #
 # Maintenance targets

Index: libqhtml/Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libqhtml/Makefile   23 Jan 2014 12:56:24 -0000      1.7
+++ libqhtml/Makefile   30 May 2014 21:31:47 -0000      1.8
@@ -21,6 +21,14 @@
 
 include $(DEPTH)/config.mak
 
+ifeq (,$(V)$(VERBOSE))
+    echo  := @echo
+    cmd   := @
+else
+    echo  := @:
+    cmd   := 
+endif
+
 ifeq ($(CC),gcc)
   CFLAGS   += -Wall -g -O2 -funsigned-char
   # do not warn about zero-length formats.
@@ -64,17 +72,19 @@
 all: $(LIB)
 
 $(LIB): $(OBJS) Makefile
-       rm -f $@
+       @rm -f $@
        $(AR) rc $@ $(OBJS)
 
 $(OBJS_DIR)/%.o: %.c $(DEPENDS) Makefile
-       $(CC) $(DEFINES) $(CFLAGS) -o $@ -c $<
+       $(echo) CC -c $<
+       $(cmd)  $(CC) $(DEFINES) $(CFLAGS) -o $@ -c $<
 
 #
 # build default style sheet file
 #
 csstoqe$(EXE): csstoqe.c Makefile
-       $(HOST_CC) $(CFLAGS) -o $@ $<
+       $(echo) CC -o $@ $<
+       $(cmd)  $(HOST_CC) $(CFLAGS) -o $@ $<
 
 html_style.c: html.css csstoqe$(EXE) Makefile
        ./csstoqe html_style < $< > $@