Slight makefile refactoring