Another makefile refactor