Updated common makefiles