Fixing makefile for use with other compilers etc.