modified Makefiles to streamline whole compilation