This closes #3690 because waf fulfills that requirement, moving the .c's to a separate directory.  waf also gives us incremental builds, so -j4 is back.