More gtest-related Makefile changes

Attempt at getting the gtest module to run on Ubuntu. Work remains.