rework on make file