Synced Makefile with caiop's branch version.