--- a/make-rules/component-report	Sat Jan 17 09:17:37 2015 -0800
+++ b/make-rules/component-report	Sun Jan 18 17:09:55 2015 -0800
@@ -9,6 +9,11 @@
 REPORT_TRANSFORMS = $(WS_TOP)/transforms/report
 CDIR=$(COMPONENT_DIR:$(WS_TOP)/%=%)
 
+# Add all the TPNO* Makefile macros together for further processing below.
+$(foreach macro, $(filter TPNO%, $(.VARIABLES)), \
+    $(eval ALL_TPNOS += $$($(macro))) \
+)
+
 component-report:	$(BUILD_DIR)/component-report
 
 $(BUILD_DIR)/component-report:	$(BUILD_DIR)/package-info
@@ -25,7 +30,9 @@
 	@echo "<td>" >>$@ ; for license in $(LICENSE) ; do \
 	     echo "$$license<br>" >>$@ ; \
 	 done ; echo "</td>" >>$@
-	@echo "<td>$(TPNO)</td>" >>$@
+	@echo "<td>" >>$@ ; for tpno in $(ALL_TPNOS) ; do \
+	     echo "$${tpno}<br>" >>$@ ; \
+	 done ; echo "</td>" >>$@
 	@echo "<td>" >>$@ ; for bugdb in $(COMPONENT_BUGDB) ; do \
 	     echo "<a href='$(BUGDB_URL)$$bugdb'>$$bugdb</a><br>" >>$@ ; \
 	 done ; echo "</td>" >>$@
@@ -43,7 +50,7 @@
 	@echo "COMPONENT_PROJECT_URL=\"$(COMPONENT_PROJECT_URL)\"" >>$@
 	@echo "COMPONENT_ARCHIVE_URL=\"$(COMPONENT_ARCHIVE_URL)\"" >>$@
 	@echo "COMPONENT_DIR=\"$(CDIR)\"" >>$@
-	@echo "TPNO=\"$(TPNO)\"" >>$@
+	@echo "TPNO=\"$(ALL_TPNOS)\"" >>$@
 	@echo "COMPONENT_BUGDB=\"$(COMPONENT_BUGDB)\"" >>$@
 	@echo "RESPONSIBLE_ENGINEER=\"$(RESPONSIBLE_ENGINEER)\"" >>$@
 	@echo "RESPONSIBLE_MANAGER=\"$(RESPONSIBLE_MANAGER)\"" >>$@