added more configuration variables to the makefile
refactor makefile build