Add some minor reorganization to the Makefile preamble Upstream-commit: 17ba356e9a291e5d128d8b6f6c4a8f2b9f1f1778 Component: engine