More GCC 4.8+ makefile fixes