Makefile expanded to work on Ubuntu 12.04