Makefile: refactored according to André's remarks.