Further work on makefile