automake cleanup: implementing non-recursive make

I'm done testing this, let's merge it.