Makefile: refactoring