cleaned up some Makefile repetition