Commit 28c699a2 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

build system: Further improve quiet mode (Jan Kiszka) 



Derived from Stuart Brady's patch: Show the target directory as prefix
to the current module when building in quiet mode. This helps to gain
overview of the current build progress, specifically when running
parallelized builds.

Furthermore, suppress make command echoing when entering subdirs and
replace $(subst subdir-,,$@) with $* in the related rule.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6447 c046a42c-6fe2-441c-8c8c-71466251a162
parent bdb19571

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ all: $(TOOLS) $(DOCS) recurse-all 
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))



subdir-%:

	$(MAKE) -C $(subst subdir-,,$@) V="$(V)" all

	$(call quiet-command,$(MAKE) -C $* V="$(V)" TARGET_DIR="$*/" all,)



$(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a

$(filter %-user,$(SUBDIR_RULES)): libqemu_user.a

rules.mak

+6 −6
Original line number Diff line number Diff line 


%.o: %.c

	$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $@")

	$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")



%.o: %.S

	$(call quiet-command,$(CC) $(CPPFLAGS) -c -o $@ $<,"  AS    $@")

	$(call quiet-command,$(CC) $(CPPFLAGS) -c -o $@ $<,"  AS    $(TARGET_DIR)$@")



%.o: %.m

	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,"  OBJC  $@")

	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,"  OBJC  $(TARGET_DIR)$@")



LINK = $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS),"  LINK  $@")

LINK = $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS),"  LINK  $(TARGET_DIR)$@")



%$(EXESUF): %.o

	$(LINK)



%.a:

	$(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"  AR    $@")

	$(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"  AR    $(TARGET_DIR)$@")



quiet-command = $(if $(V),$1,@echo $2 && $1)
 
quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1))