Update Makefile and Configure for stand-alone make building