Makefile - refactoring 2