Switched to a Makefile configuration