qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Weil <sw@weilnetz.de>
To: qemu-trivial <qemu-trivial@nongnu.org>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2 for-2.1] po: Fix Makefile rules for in-tree builds without configuration
Date: Sat, 23 Aug 2014 09:26:33 +0200	[thread overview]
Message-ID: <53F84229.3020404@weilnetz.de> (raw)
In-Reply-To: <1405695149-27462-1-git-send-email-sw@weilnetz.de>

Am 18.07.2014 um 16:52 schrieb Stefan Weil:
> Adding 'update' to the phony targets fixes this error:
> 
> $ LANG=C make -C po update
> make: Entering directory `/qemu/po'
>   LINK  update
> /qemu/po/de_DE.po: file not recognized: File format not recognized
> collect2: error: ld returned 1 exit status
> make: *** [update] Error 1
> make: Leaving directory `/qemu/po'
> 
> Some other phony targets (build, install) were also added, and the
> existing .PHONY statement was moved to a more prominent position at
> the beginning of the Makefile.
> 
> The patch also fixes a 2nd bug. The default target should be 'all',
> but instead 'modules' (from rules.mak) was the default. Fix this by
> adding 'all' as a target before any include statement.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> 
> v2: Update the subject line because the patch is only needed for
>     in-tree builds without configuration).
>     Rebase patch (v1 was based on a locally modified tree).
> 
>  po/Makefile |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/po/Makefile b/po/Makefile
> index 669f865..1ab241a 100644
> --- a/po/Makefile
> +++ b/po/Makefile
> @@ -4,6 +4,11 @@
>  # Set SRC_PATH for in-tree builds without configuration.
>  SRC_PATH=..
>  
> +# The default target must come before any include statements.
> +all:
> +
> +.PHONY:	all build clean install update
> +
>  -include ../config-host.mak
>  include $(SRC_PATH)/rules.mak
>  
> @@ -45,5 +50,3 @@ $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
>  
>  $(PO_PATH)/%.po: $(PO_PATH)/messages.po
>  	$(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@, "  GEN   $@")
> -
> -.PHONY: clean all
> 


Ping. Please consider this patch for the trivial qeueue.

Thanks,
Stefan

  reply	other threads:[~2014-08-23  7:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-18 14:52 [Qemu-devel] [PATCH v2 for-2.1] po: Fix Makefile rules for in-tree builds without configuration Stefan Weil
2014-08-23  7:26 ` Stefan Weil [this message]
2014-08-24  9:17   ` Michael Tokarev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53F84229.3020404@weilnetz.de \
    --to=sw@weilnetz.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).