Found a better way to handle the Makefile and reworked it a bit.