Make Makefile.in consistent with Makefile.am