Suzero. Refactors dependencies in Makefile.standalone.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
 #        PNACL_BIN_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 232 matching lines @@
     -Wno-unused-parameter \
     -Wwrite-strings
   OBJDIR := $(OBJDIR)+Gplusplus
 endif
 
 BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \
   -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g -pedantic \
   $(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)
 # Not specifying -Wl,--gc-sections but instead doing bitcode linking GC w/ LTO.
 SB_LDFLAGS := $(LINKOPTLEVEL) $(LD_EXTRA)
 
 # List the target-specific source files first, which generally take longer to
 # compile, in the hope of improving parallel build time.
 SRCS = \
   IceAssemblerARM32.cpp \
@@ skipping 136 matching lines @@
 
 $(SBB_OBJDIR)/pnacl_public_x86_32_pnacl_sz_nexe: $(SBB_OBJDIR)/pnacl-sz.pexe
         $(SB_TRANSLATE) -arch x86-32 $^ -o $@
 
 $(SBB_OBJDIR)/pnacl_public_x86_64_pnacl_sz_nexe: $(SBB_OBJDIR)/pnacl-sz.pexe
         $(SB_TRANSLATE) -arch x86-64 $^ -o $@
 
 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)
         $(CXX) $(GTEST_LIB_PATH) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
           -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/ \
           -I$(LLVM_SRC_PATH)/utils/unittest/googletest/include \
           -I$(LLVM_SRC_PATH) \
           -DGTEST_HAS_RTTI=0 -DGTEST_USE_OWN_TR1_TUPLE \
           -Wno-expansion-to-defined \
           $< -o $@
 
 $(OBJS): | $(OBJDIR)
@@ skipping 233 matching lines @@
 
 help-check-xtest:
         @cat Makefile.standalone-help/check-xtest.txt
 
 clean:
         rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \
           $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json
 
 clean-all: clean
         rm -rf build/ crosstest/Output/