The local makefiles today consists of two content types:
* Fixed parts that should not be modified by users (subdirs, includes, variable definitons)
* the actual local modifications
This mixture makes the system quite brittle and easy to cause merge conflicts in. One solution is to let the main Makefile.am file only contain the fixed parts, and from there include another local file that ONLY includes the user-modifiable parts.