Tweak makefile to use macros