ticket:5 reverting back makefile changes