Updated project makefiles