Improved Makefile building mechanism.