Re-write makefile