Rework the Messages make file. (dm)