Fix some ordering issues in the Makefile so that we can now compile on ada.