Makefile re-jiggering

Change-Id: I6a8d7c9ecbc4f1af8bc4a6e1409787f215d6fc5b
6 files changed