Sync the Makefile with the current one
Initial import of ndiff