Makefile adjustments

Signed-off-by: flar2 <asegaert@gmail.com>
Merge branch 'optimization/kernel'