Misc Makefile improvements

What does this Merge Request do?

This MR tidies up the Makefile to make future updates/deprecations easier.

Merge Request checklist

• Tests added for new functionality. If not, please raise Issue to follow-up.
• This change is backward compatible. If not, please include steps to communicate to our users.
• Documentation added/updated, if needed.
• gdk doctor test added, if needed.