Merge "Update makefiles iff there is a change"