refactored remaining architectures in Makefile