Slight modifications to makefile for debugging and test suite builds.