Clean up the Makefile.am a bit