Remove redundancy in Rake and Make files