Added more targets to main makefile

This is a first test of the buildbot.