changing to a single makefile