[misham]

I'm putting together a pull request with some cleanup for Automake files. I'll take a look at porting the Automake configs to Scons next.