Reorganize Makefile variables