Simplify subdirectory makefiles, and be more robust by checking that they define the appropriate variables.

llvm-svn: 93714