sync Makefile and CI with Iris

Merged Ralf Jung requested to merge ralf/makefile into master

Merge request reports