added Makefile macros for better tooling