Last tweak getting Make to play nice, before moving to automake