WIP - Update the make file

@sagotsky WIP #2100 
@amitaibu #210 related