[build] DEPs build quietly now and aren't generated when making clean.
This commit is contained in:
		
							
								
								
									
										10
									
								
								Makefile.in
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								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) $*.$$$$ | ||||
|  | ||||
| #---------------------------------------------------------------- | ||||
|  | ||||
|   | ||||
| @@ -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]  $<" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user