Fix parallel make

This should fix building in parallel (aka #84). This _will_ conflict with #85, so I will probably need to rebase after that one has been merged.