Some more work on automake files