Updated makefiles to fix bug in last commit.