Update Makefile; build in one step and add xi2event