Makefile refactoring.