Macron announces extra military spending over next two years