Makefile changes for compiling under Ubuntu