makefile and remove redundant conditional logic