merge Makefile for new FC19 toolchain