Sync Makefile with source branch
Generated master for commit be8389a
Merge: c2d295e 0115aee
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #12 from CNERG/update_build