Makefile modifications to improve build process