Makefile: refactor a little