Simplify configure.ac and makefile.am files