diff --git a/build/shave.in b/build/shave.in
index 5c16f27ae..cedccd476 100644
--- a/build/shave.in
+++ b/build/shave.in
@@ -69,6 +69,9 @@ lt_unmangle "$lt_output"
 output=$last_result
 
 if test -z $V; then
+    if test $output = "/dev/null"; then
+	pass_through=1
+    fi
     if test $pass_through -eq 0; then
         echo "$Q$output"
     fi
diff --git a/src/Makefile.am.analysis b/src/Makefile.am.analysis
index 4d527bf15..ea9caec4d 100644
--- a/src/Makefile.am.analysis
+++ b/src/Makefile.am.analysis
@@ -23,7 +23,7 @@ uno:
 headers-standalone: $(enabled_cairo_headers) $(enabled_cairo_private)
 	@echo Checking that enabled public/private headers can be compiled standalone
 	@status=true; for f in $(enabled_cairo_headers) $(enabled_cairo_private); do \
-		echo $(COMPILE) -o /dev/null $(srcdir)/$$f; \
+		echo "  CHECK $$f"; \
 		$(COMPILE) -o /dev/null $(srcdir)/$$f || status=false; \
 	done; $$status
 	@touch $@