move  makefile elements to be on condition
remove older makefiles