Clean up the makefiles a bit and make them OBJDIR-safe.
Merge pull request #542 from dag-erling/makefiles

Clean up the makefiles a bit and make them OBJDIR-safe.