Use the new sortsmill-autogen.sh script.
Fix a minor Makefile.am problem.