Need to change a few definitions in Makefile to use the Makefile