Added make and GDB changes

Added make and GDB changes