Adding in the makefile to build either version