[PATCH v6 07/11] Makefile: Tidy up the TPL build rules