Update to compiz 0.8.8 and move common bits to Makefile.inc