Suzero. Refactors dependencies in Makefile.standalone.

Makefile.standalone

Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index 40d9692093f5e1c7c6beaed19fd19758d5c7a049..a09be4c97f606a8e8852be45e78161f72f807dd2 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -250,9 +250,9 @@ BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \
   $(LLVM_EXTRA_WARNINGS) $(CXX_EXTRA)
 
 CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \
-  $(STDLIB_FLAGS)
+  $(STDLIB_FLAGS) -MP -MD

[Jim Stichnoth, 2016/03/15 23:43:58]

Can these two additions of "-MP -MD" be refactored into BASE_CXXFLAGS?

[John, 2016/03/16 11:13:40]

Done.

 SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(BASE_CXX_DEFINES) \
-               -Wno-unknown-pragmas -I$(NACL_ROOT) -I$(NACL_ROOT)/..
+               -Wno-unknown-pragmas -I$(NACL_ROOT) -I$(NACL_ROOT)/.. -MP -MD
 
 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib -Wl,--gc-sections \
   $(LD_EXTRA) $(STDLIB_FLAGS)
@@ -409,14 +409,16 @@ $(SBB_OBJDIR)/pnacl_public_x86_64_pnacl_sz_nexe: $(SBB_OBJDIR)/pnacl-sz.pexe
 src/IceRegistersARM32.def: pydir/gen_arm32_reg_tables.py
 	python $< > $@
 
-# TODO(stichnot): Be more precise than "*.h" here and elsewhere.
-$(OBJS): $(OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
+-include $(foreach dep,$(SRCS:.cpp=.d),$(OBJDIR)/$(dep))
+$(OBJS): $(OBJDIR)/%.o: src/%.cpp
 	$(CXX) -c $(CXXFLAGS) $< -o $@
 
-$(SB_OBJS): $(SB_OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
+-include $(foreach dep,$(SRCS:.cpp=.d),$(SB_OBJDIR)/$(dep))
+$(SB_OBJS): $(SB_OBJDIR)/%.o: src/%.cpp
 	$(SB_CXX) -c $(SB_CXXFLAGS) -DPNACL_BROWSER_TRANSLATOR=0 $< -o $@
 
-$(SBB_OBJS): $(SBB_OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
+-include $(foreach dep,$(SRCS:.cpp=.d),$(SBB_OBJDIR)/$(dep))
+$(SBB_OBJS): $(SBB_OBJDIR)/%.o: src/%.cpp
 	$(SB_CXX) -c $(SB_CXXFLAGS) -DPNACL_BROWSER_TRANSLATOR=1 $< -o $@
 
 $(OBJDIR)/run_unittests: $(UNITTEST_OBJS) $(UNITTEST_LIB_OBJS)
@@ -424,8 +426,8 @@ $(OBJDIR)/run_unittests: $(UNITTEST_OBJS) $(UNITTEST_LIB_OBJS)
           -lgtest -lgtest_main -ldl \
           -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
 
-$(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp unittest/*.h \
-                  src/*.h src/*.def
+-include $(foreach dep,$(UNITTEST_SRCS:.cpp=.d),$(OBJDIR)/unittest/$(dep))
+$(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp
 	$(CXX) -c $(CXXFLAGS) \
           -Isrc/ \
           -Iunittest/ \