Makefile: refactor