Update GNUMakefile for newer code