Makefile: Better output beautifier

This is better code and makes prettier output

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

diff --git a/Makefile b/Makefile
index 01bcb604e540b4286bf4248ddb5d6f297ae7f16d..1eab2be6ab3fdb905e50220e2175b29e190fee5e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,16 +13,25 @@ PLANET_DEBUG_OBJS= $(patsubst %.o,%-debug.o,$(PLANET_OBJS))
 ALL_OBJS = $(PLANET_OBJS) $(PLANET_DEBUG_OBJS)
 ALL_DEBS = $(patsubst %.o,.%.o.d,$(ALL_OBJS))
 
+ifeq ($(V),1)
+       Q               =
+       QUIET_CC        =
+       QUIET_LINK      =
+else
+       Q               = @
+       QUIET_CC        = @echo "       CC " $@;
+       QUIET_LINK      = @echo "     LINK " $@;
+endif
+
 sdl-planet: $(PLANET_OBJS)
-       gcc $(LIBS) -o $@ $(PLANET_OBJS)
+       $(QUIET_LINK)$(CC) $(LIBS) -o $@ $(PLANET_OBJS)
 
 debug-planet: $(PLANET_DEBUG_OBJS)
-       gcc $(LIBS) -o $@ $(PLANET_DEBUG_OBJS) -DDEBUG
+       $(QUIET_LINK)$(CC) $(LIBS) -o $@ $(PLANET_DEBUG_OBJS) -DDEBUG
 
 .c.o:
-       @echo -e "\tCC\t" $@
-       @$(CC) -MMD -MF .$@.d $(CFLAGS) -c $< -o $@
-       @cp .$@.d .$@.P; \
+       $(QUIET_CC)$(CC) -MMD -MF .$@.d $(CFLAGS) -c $< -o $@
+       $(Q)cp .$@.d .$@.P; \
             sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
                 -e '/^$$/ d' -e 's/$$/ :/' < .$@.d >> .$@.P; \
             mv .$@.P .$@.d
@@ -35,16 +44,15 @@ ifeq ($(C),2)
 endif
 
 %-debug.o: %.c
-       @echo -e "\tCC\t" $@
-       @$(CC) -MMD -MF .$@.d $(CFLAGS) -DDEBUG -O0 -c $< -o $@
-       @cp .$@.d .$@.P; \
+       $(QUIET_CC)$(CC) -MMD -MF .$@.d $(CFLAGS) -DDEBUG -O0 -c $< -o $@
+       $(Q)cp .$@.d .$@.P; \
             sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
                 -e '/^$$/ d' -e 's/$$/ :/' < .$@.d >> .$@.P; \
             mv .$@.P .$@.d
 
 TAGS:
-       @echo -e "\tTAGS\t"
-       @etags *.[ch]
+       @echo "     TAGS"
+       $(Q)etags *.[ch]
 
 clean:
        rm -rfv $(ALL_OBJS) *~ sdl-planet TAGS $(ALL_DEBS) \