from Joerg Mayer: changes towards the automake generation