commit 5192aff

Simplify silent rules

 1@@ -67,15 +67,6 @@ endef
 2 
 3 $(foreach pkg,$(PACKAGES),$(eval $(call check,$(pkg))))
 4 
 5-ifeq ($(if $(V),$(V),0), 0)
 6-    define quiet
 7-        @echo "  $1	$@"
 8-        @$(if $2,$2,$($1))
 9-    endef
10-else
11-    quiet = $(if $2,$2,$($1))
12-endif
13-
14 FINAL_CFLAGS = $(CFLAGS) -fvisibility=hidden -std=gnu99
15 FINAL_CPPFLAGS = $(CPPFLAGS) -D_GNU_SOURCE # Required for mkostemp
16 
17@@ -89,9 +80,19 @@ ifeq ($(ENABLE_DEBUG),1)
18     FINAL_CFLAGS += -g
19 endif
20 
21-compile     = $(call quiet,CC) $(FINAL_CPPFLAGS) $(FINAL_CFLAGS) -I . -c -o $@ $< \
22-              -MMD -MP -MF .deps/$(basename $<).d -MT $(basename $@).o -MT $(basename $@).lo
23-link        = $(call quiet,CCLD,$(CC)) $(LDFLAGS) -o $@ $^
24+ifeq ($(if $(V),$(V),0),0)
25+    quiet = @echo '  $1 $@';
26+endif
27+
28+Q_AR      = $(call quiet,AR     )
29+Q_CC      = $(call quiet,CC     )
30+Q_CCLD    = $(call quiet,CCLD   )
31+Q_GEN     = $(call quiet,GEN    )
32+Q_SYM     = $(call quiet,SYM    )
33+
34+compile   = $(Q_CC)$(CC) $(FINAL_CPPFLAGS) $(FINAL_CFLAGS) -I . -c -o $@ $< \
35+            -MMD -MP -MF .deps/$(basename $<).d -MT $(basename $@).o -MT $(basename $@).lo
36+link      = $(Q_CCLD)$(CC) $(LDFLAGS) -o $@ $^
37 
38 include $(SUBDIRS:%=%/local.mk)
39 
40@@ -102,7 +103,7 @@ $(foreach dir,BIN LIB INCLUDE PKGCONFIG,$(DESTDIR)$($(dir)DIR)) $(DESTDIR)$(DATA
41 build: $(SUBDIRS:%=build-%) $(TARGETS)
42 
43 swc.pc: swc.pc.in
44-	$(call quiet,GEN,sed)                   \
45+	$(Q_GEN)sed                             \
46 	    -e "s:@VERSION@:$(VERSION):"        \
47 	    -e "s:@PREFIX@:$(PREFIX):"          \
48 	    -e "s:@LIBDIR@:$(LIBDIR):"          \

1@@ -8,7 +8,7 @@ $(dir)/convert_font: $(dir)/convert_font.o
2 	$(link)
3 
4 $(dir)/cursor_data.h: $(dir)/cursor.pcf $(dir)/convert_font
5-	$(call quiet,GEN,cursor/convert_font) $< $@ 2> /dev/null
6+	$(Q_GEN)cursor/convert_font $< $@ 2>/dev/null
7 
8 CLEAN_FILES += $(dir)/convert_font.o
9 

 1@@ -84,16 +84,16 @@ $(call objects,xdg_shell xdg_surface xdg_popup): protocol/xdg-shell-server-proto
 2 $(call objects,pointer): cursor/cursor_data.h
 3 
 4 $(dir)/libswc.a: $(SWC_STATIC_OBJECTS)
 5-	$(call quiet,AR) cru $@ $^
 6+	$(Q_AR)$(AR) cru $@ $^
 7 
 8 $(dir)/$(LIBSWC_LIB): $(SWC_SHARED_OBJECTS)
 9 	$(link) -shared -Wl,-soname,$(LIBSWC_SO) -Wl,-no-undefined $(libswc_PACKAGE_LIBS)
10 
11 $(dir)/$(LIBSWC_SO): $(dir)/$(LIBSWC_LIB)
12-	$(call quiet,SYM,ln -sf) $(notdir $<) $@
13+	$(Q_SYM)ln -sf $(notdir $<) $@
14 
15 $(dir)/$(LIBSWC_LINK): $(dir)/$(LIBSWC_SO)
16-	$(call quiet,SYM,ln -sf) $(notdir $<) $@
17+	$(Q_SYM)ln -sf $(notdir $<) $@
18 
19 .PHONY: install-libswc.a
20 install-libswc.a: $(dir)/libswc.a | $(DESTDIR)$(LIBDIR)

 1@@ -12,10 +12,10 @@ $(dir)_TARGETS := $(PROTOCOL_EXTENSIONS:%.xml=%-protocol.c) \
 2 $(dir)_PACKAGES := wayland-server
 3 
 4 $(dir)/%-protocol.c: $(dir)/%.xml
 5-	$(call quiet,GEN,$(WAYLAND_SCANNER)) code < $< > $@
 6+	$(Q_GEN)$(WAYLAND_SCANNER) code <$< >$@
 7 
 8 $(dir)/%-server-protocol.h: $(dir)/%.xml
 9-	$(call quiet,GEN,$(WAYLAND_SCANNER)) server-header < $< > $@
10+	$(Q_GEN)$(WAYLAND_SCANNER) server-header <$< >$@
11 
12 install-protocol: | $(DESTDIR)$(DATADIR)/swc
13 	install -m0644 protocol/swc.xml "$(DESTDIR)$(DATADIR)/swc"