Refactoring makefile