[build] shuffle around stuff from the Makefiles a bit