Start reworking the makefiles