Makefile changed, added macros