yet another attempt at fixing the makefiles