continuing to port stuff to automake