update Makefile to recent functional version without error in conditional tests and a recipe for cleaning the directory