Updated makefile for latest svn merge