Removes some gmock internal macros; sorts the file lists in Makefile.am; picks up gtest r454.


git-svn-id: http://googlemock.googlecode.com/svn/trunk@311 8415998a-534a-0410-bf83-d39667b30386
7 files changed