Removed the repetition in the makefiles

Less repetition, more sanity: much better :-)