makefile reorganizing