Add parameters that are needed to build with gtk-doc svn trunk and don't hurt when used with older versions.
Sync other parts of makefiles (namely expand_content files).