Revert "Refine the makefiles."

This reverts commit fa52e2083927dd4ea543528c557d52ab578ad34c.
15 files changed