Start cleaning up the make file to make it independent of the machine
Further clean-up of the make file