Move back to Makefile for happiness and rainbows