Improve Makefile

These two commits improve the makefile in order to be able to build with gcc.