Improved build makefile