From 759263d3880ba467f156c70d0aa76969f1db10b9 Mon Sep 17 00:00:00 2001
From: Joe Thornber <ejt@redhat.com>
Date: Thu, 27 Jun 2013 10:17:38 +0100
Subject: [PATCH] [build] DEPs build quietly now and aren't generated when
 making clean.

---
 Makefile.in            | 10 ++++------
 unit-tests/Makefile.in |  6 +++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c5ff8d9..1dbd483 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,15 +105,13 @@ endif
 
 .SUFFIXES: .d
 
-%.d: %.cc
-	@echo "    [DEP] $<"
-	$(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(TEST_INCLUDES) $(CXXFLAGS) $< > $@.$$$$;\
-	sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $@ : Makefile ,g' < $@.$$$$ > $@; \
-	$(RM) $@.$$$$
-
 %.o: %.cc
 	@echo "    [CXX] $<"
 	$(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $<
+	@echo "    [DEP] $<"
+	$(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(TEST_INCLUDES) $(CXXFLAGS) $< > $*.$$$$; \
+	sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*; \
+	$(RM) $*.$$$$
 
 #----------------------------------------------------------------
 
diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in
index 57e164f..add41ab 100644
--- a/unit-tests/Makefile.in
+++ b/unit-tests/Makefile.in
@@ -70,7 +70,11 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE))
 
 %.gmo: %.cc
 	@echo "    [CXX] $<"
-	$(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) -o $@ $<
+	$(V) $(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) -o $@ $<
+	@echo "    [DEP] $<"
+	$(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) $< > $*.$$$$; \
+	sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*; \
+	$(RM) $*.$$$$
 
 unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
 	@echo "    [LD]  $<"