Move some make variables around so they are available when cleaning