Quieten down the build

This commit is contained in:
Joe Thornber 2013-03-22 12:19:31 +00:00
parent edb33dce4c
commit 50bab1c90a
2 changed files with 11 additions and 6 deletions

View File

@ -18,6 +18,7 @@
.PHONY: all .PHONY: all
V=@
PROGRAMS=\ PROGRAMS=\
cache_check \ cache_check \
cache_dump \ cache_dump \
@ -92,12 +93,14 @@ test-programs: $(TEST_PROGRAMS)
.SUFFIXES: .d .SUFFIXES: .d
%.d: %.cc %.d: %.cc
$(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(CXXFLAGS) $< > $@.$$$$;\ @echo " [dependencies] $<"
sed 's,\([^ :]*\)\.o[ :]*,\1.o $@ : Makefile ,g' < $@.$$$$ > $@; \ $(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(CXXFLAGS) $< > $@.$$$$;\
$(RM) $@.$$$$ $(V) sed 's,\([^ :]*\)\.o[ :]*,\1.o $@ : Makefile ,g' < $@.$$$$ > $@; \
$(V) $(RM) $@.$$$$
%.o: %.cc %.o: %.cc
$(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $< @echo " [CXX] $<"
$(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $<
#---------------------------------------------------------------- #----------------------------------------------------------------
# Thin provisioning tools # Thin provisioning tools

View File

@ -103,11 +103,13 @@ MOCK_SOURCE=\
.SUFFIXES: .gmo .SUFFIXES: .gmo
%.gmo: %.cc %.gmo: %.cc
$(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) -o $@ $< @echo " [CXX] $<"
$(V) $(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) -o $@ $<
MOCK_OBJECTS=$(subst .cc,.gmo,$(MOCK_SOURCE)) MOCK_OBJECTS=$(subst .cc,.gmo,$(MOCK_SOURCE))
unit-tests/gmock_tests: $(MOCK_OBJECTS) lib/libgmock.a unit-tests/gmock_tests: $(MOCK_OBJECTS) lib/libgmock.a
g++ $(CXXFLAGS) -o $@ $(MOCK_OBJECTS) $(LIBS) $(GMOCK_LIBS) @echo " [LD] $<"
$(V) g++ $(CXXFLAGS) -o $@ $(MOCK_OBJECTS) $(LIBS) $(GMOCK_LIBS)
all: $(TEST_PROGRAMS) all: $(TEST_PROGRAMS)