more makefile work

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
more work

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
renamed files

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
minor fix

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
more makefile work

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>