updated makefile and source files to address errors reported by GCC