Make the main target more generic, to allow compilation of