cosmetic: move some makefile variable definitions