[Top][All Lists]

[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.
+# The default target must come before any include statements.
+.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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]