recursion in the build system is a pain

try to deal with it

Change-Id: I97f0a3b3d55f0b2c81b74e26f4a17af566e59dd3