update makefile, replace variables with single var, update exe