both windows and unix makefiles have been updated