diff options
| author | Stefan Weil | 2014-07-18 16:52:29 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2014-08-24 11:16:42 +0200 |
| commit | bcc55f327c571295193880110c048b463bce6677 (patch) | |
| tree | 40b6f5232c0c705619c3c25149a3cfad697c1c86 | |
| parent | slirp/misc: Use the GLib memory allocation APIs (diff) | |
| download | qemu-bcc55f327c571295193880110c048b463bce6677.tar.gz qemu-bcc55f327c571295193880110c048b463bce6677.tar.xz qemu-bcc55f327c571295193880110c048b463bce6677.zip | |
po: Fix Makefile rules for in-tree builds without configuration
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>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | po/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/po/Makefile b/po/Makefile index 669f8654a6..1ab241a5b7 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 |