Revert "Modify makefile to build in CM"

This reverts commit c25d335ddf8a14bd17c0b3cfcf14bd731155fd26.
Revert "Makefile: add graphite optimizations"

This reverts commit 33c385fe73612c8ecc22d2d42424122797b109ce.
Change for GCC 4.6