Miscellaneous patches from Ralf Corsepius <corsepiu@…> that are part of the Makefile.am conversion effort but were missed in the previous commits.