Further updates to makefile to support inclusion as a submodule