Whoops -- forgot to remove the previous two makefiles when their functionality was migrated to the single makefile.