Moved Make macros to match conventions in QM project