next: Fix up makefiles to fit our templating system.