Reworked makefile to correctly conditionally compile