Updated with new working automake setup.