From: Joshua Oreman <oremanj@rwcr.net>
Date: Wed, 30 Dec 2009 01:28:34 +0000 (-0500)
Subject: [makefile] Allow .sizes target to work with funny-named objects
X-Git-Tag: v1.0.0-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f94845168a4ec6f7cddd35e64638e54bd3f64dab;p=thirdparty%2Fipxe.git

[makefile] Allow .sizes target to work with funny-named objects

The bin/xxx.sizes targets examine the list of obj_ symbols in bin/xxx.tmp
to determine which objects to measure the size of. These symbols have been
normalized to C identifiers, so the result is an error message from `size'
when examining a target that includes objects that were originally named
with hyphens.

Fix by turning obj_foo_bar into $(wildcard bin/foo?bar.o) instead of
bin/foo_bar.o.

Signed-off-by: Marty Connor <mdc@etherboot.org>
---

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 63745ff86..1642374c2 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -677,7 +677,7 @@ endef
 $(BIN)/%.objs : $(BIN)/%.tmp
 	$(Q)$(ECHO) $(call objs_list,$<)
 $(BIN)/%.sizes : $(BIN)/%.tmp
-	$(Q)$(SIZE) -t $(foreach OBJ,$(call objs_list,$<),$(BIN)/$(OBJ).o) | \
+	$(Q)$(SIZE) -t $(foreach OBJ,$(call objs_list,$<),$(wildcard $(BIN)/$(subst _,?,$(OBJ)).o)) | \
 		sort -g
 
 # Get dependency list for the specified target