Remade makefile