diff --git a/Makefile b/Makefile
index 7ba4bd86..5d6c2752 100644
--- a/Makefile
+++ b/Makefile
@@ -494,6 +494,7 @@ cleanup-style:
build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
$(foreach TARGET,$(MXE_TARGET_LIST),$(eval $(TARGET)_PKGCOUNT := 0))
$(eval BUILD_PKGCOUNT := 0)
+ $(eval BUILD_ONLY_PKGCOUNT := 0)
$(eval VIRTUAL_PKGCOUNT := 0)
@echo '' > $@
@echo '' >> $@
@@ -534,12 +535,14 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
@echo '
' >> $@
@$(foreach PKG,$(PKGS), \
$(eval $(PKG)_VIRTUAL := $(true)) \
+ $(eval $(PKG)_BUILD_ONLY := $(true)) \
echo '' >> $@; \
echo '$(PKG) | ' >> $@; \
$(foreach TARGET,$(MXE_TARGET_LIST), \
$(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(TARGET))), \
$(eval $(TARGET)_PKGCOUNT := $(call inc,$($(TARGET)_PKGCOUNT))) \
$(eval $(PKG)_VIRTUAL := $(false)) \
+ $(eval $(PKG)_BUILD_ONLY := $(false)) \
echo 'Y | ' >> $@;, \
echo 'N | ' >> $@;)) \
$(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \
@@ -548,12 +551,17 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
echo 'Y | ' >> $@;, \
echo 'N | ' >> $@;) \
$(if $($(PKG)_VIRTUAL), \
- $(eval VIRTUAL_PKGCOUNT := $(call inc,$(VIRTUAL_PKGCOUNT)))))
+ $(eval VIRTUAL_PKGCOUNT := $(call inc,$(VIRTUAL_PKGCOUNT)))) \
+ $(if $($(PKG)_BUILD_ONLY), \
+ $(eval BUILD_ONLY_PKGCOUNT := $(call inc,$(BUILD_ONLY_PKGCOUNT)))))
@echo '
' >> $@
- @echo 'Total: $(call subtract,$(words $(PKGS)),$(VIRTUAL_PKGCOUNT)) (+$(VIRTUAL_PKGCOUNT) virtual) | ' >> $@
- @$(foreach TARGET,$(MXE_TARGET_LIST), \
+ $(eval TOTAL_PKGCOUNT := $(call subtract,$(call subtract,$(words $(PKGS)),$(VIRTUAL_PKGCOUNT)),$(BUILD_ONLY_PKGCOUNT)))
+ @echo '' >> $@
+ @echo 'Total: $(TOTAL_PKGCOUNT) (+$(VIRTUAL_PKGCOUNT) virtual +$(BUILD_ONLY_PKGCOUNT) native-only)' >> $@
+ @echo ' | ' >> $@
+ @$(foreach TARGET,$(MXE_TARGET_LIST), \
echo '$($(TARGET)_PKGCOUNT) | ' >> $@;)
- @echo '$(BUILD_PKGCOUNT) | ' >> $@
+ @echo '$(BUILD_PKGCOUNT) | ' >> $@
@echo '
' >> $@
@echo '' >> $@
@echo '' >> $@