Modify the makefile and common.mk