Adjusted makefiles to accommodate r3133.