Improved macro declaration and use in makefile