Updated the makefile common