Change makefile to reduce duplication.
Merge pull request #1 from ajbennieston/master

Update Makefile