refactor Makefiles (closes #3536)
Merge pull request #4 from Eric-Brison/1.0-A3536

refactor Makefiles (closes #3536)