merged the two Makefiles into one