CHanged Makefiles to avoid linking to outside files