[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 08/11] po: Fix Makefile rules for in-tree builds wi
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 08/11] po: Fix Makefile rules for in-tree builds without configuration |
Date: |
Sun, 24 Aug 2014 17:30:59 +0400 |
From: Stefan Weil <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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 $@ $< > address@hidden && mv
address@hidden $@, " GEN $@")
-
-.PHONY: clean all
--
1.7.10.4
- [Qemu-trivial] [PULL 00/11] Trivial patches for 2014-08-24, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 09/11] linux-user: fix file descriptor leaks, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 03/11] tests/bios-tables-test: check the value returned by fopen(), Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 06/11] configure: no need to mkdir QMP, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 02/11] tcg: dump op count into qemu log, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 10/11] libdecnumber: Fix warnings from smatch (missing static, boolean operations), Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 01/11] util/path: Use the GLib memory allocation routines, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 07/11] slirp/misc: Use the GLib memory allocation APIs, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 08/11] po: Fix Makefile rules for in-tree builds without configuration,
Michael Tokarev <=
- [Qemu-trivial] [PULL 05/11] dma: axidma: Variablise repeated s->streams[i] sub-expr, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 04/11] microblaze: ml605: Get rid of ddr_base variable, Michael Tokarev, 2014/08/24
- [Qemu-trivial] [PULL 11/11] vmxnet3: Pad short frames to minimum size (60 bytes), Michael Tokarev, 2014/08/24
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/11] Trivial patches for 2014-08-24, Peter Maydell, 2014/08/25