cleaning up Makefile.am a bit