Updated makefile to compile correct thing, and use variables for compilation