The Makefiles are getting a bit messy. In order to keep them maintainable I suggest to clean them up at some stage.