CFY-759 makefile optimization