aboutsummaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-10-04 17:27:21 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-10-06 12:11:51 +0100
commit0bdb12c7c50e2e92f2e17fe29ca8a8ddee91b4a1 (patch)
tree9f79db694e9d782ca69f4caba8d5d5c9bc00361c /po
parenta65b6f27ce65e2e4f771f69d549ffa455a4d543a (diff)
downloadqemu-arm-0bdb12c7c50e2e92f2e17fe29ca8a8ddee91b4a1.tar.gz
rules.mak: quiet-command: Split command name and args to print
The quiet-command make rule currently takes two arguments: the command and arguments to run, and a string to print if the V flag is not set (ie we are not being verbose). By convention, the string printed is of the form " NAME some args". Unfortunately to get nicely lined up output all the strings have to agree about what column the arguments should start in, which means that if we add a new quiet-command usage which wants a slightly longer CMD name then we either put up with misalignment or change every quiet-command string. Split the quiet-mode string into two, the "NAME" and the "same args" part, and use printf(1) to format the string automatically. This means we only need to change one place if we want to support a longer maximum name. In particular, we can now print 7-character names lined up properly (they are needed for the OSX "SETTOOL" invocation). Change all the uses of quiet-command to the new syntax. (Any which are missed or inadvertently reintroduced via later merges will result in slightly misformatted quiet output rather than disaster.) A few places in the pc-bios/ makefiles are updated to use "BUILD", "SIGN" and "STRIP" rather than "Building", "Signing" and "Stripping" for consistency and to keep them below 7 characters. Module .mo links now print "LD" rather than the nonstandard "LD -r". Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 1475598441-27908-1-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'po')
-rw-r--r--po/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/po/Makefile b/po/Makefile
index 7bab09dce2..cc630363de 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -10,7 +10,7 @@ all:
.PHONY: all build clean install update
%.mo: %.po
- $(call quiet-command, msgfmt -o $@ $<, " GEN $@")
+ $(call quiet-command, msgfmt -o $@ $<,"GEN","$@")
-include ../config-host.mak
include $(SRC_PATH)/rules.mak
@@ -46,7 +46,7 @@ $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
xgettext -o - --from-code=UTF-8 --foreign-user \
--package-name=QEMU --package-version=$(VERSION) \
--msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \
- sed -e s/CHARSET/UTF-8/) >$@, " GEN $@")
+ sed -e s/CHARSET/UTF-8/) >$@,"GEN","$@")
$(PO_PATH)/%.po: $(PO_PATH)/messages.po
- $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@, " GEN $@")
+ $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@,"GEN","$@")