am 335482c4: Fix make files for unbundled tree builds

* commit '335482c41b2ac3b66da2e207b47306fb53f4b174':
  Fix make files for unbundled tree builds