makefile now uses macros