Revert automake subdir-objects

This is supposed to be the automake default in the future, but it
breaks 'make distclean' for our build. Each time I fix one instance
of this breakage another one pops up.