Fix makefiles.
Merge pull request #14 from VoltDB/makefilefixes

Fix makefiles.