From: Jeff King <peff@peff.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH 1/3] i18n: treat "make pot" as an explicitly-invoked target
Date: Fri, 22 Aug 2014 00:32:08 -0400 [thread overview]
Message-ID: <20140822043208.GA18192@peff.net> (raw)
In-Reply-To: <20140822042716.GE27992@peff.net>
From: Jonathan Nieder <jrnieder@gmail.com>
po/git.pot is normally used as-is and not regenerated by people
building git, so it is okay if an explicit "make po/git.pot" always
automatically regenerates it. Depend on the magic FORCE target
instead of explicitly keeping track of dependencies.
This simplifies the makefile, in particular preparing for a moment
when $(LIB_H), which is part of $(LOCALIZED_C), can be computed on the
fly. It also fixes a slight breakage in which changes to perl and shell
scripts did not trigger a rebuild of po/git.pot.
We still need a dependency on GENERATED_H, to force those files to be
built when regenerating git.pot.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
---
Mostly as you sent it, but I mentioned the missing script dependencies
in the commit message, too.
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 2320de5..cf0ccdf 100644
--- a/Makefile
+++ b/Makefile
@@ -2138,7 +2138,7 @@ LOCALIZED_SH += t/t0200/test.sh
LOCALIZED_PERL += t/t0200/test.perl
endif
-po/git.pot: $(LOCALIZED_C)
+po/git.pot: $(GENERATED_H) FORCE
$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \
$(LOCALIZED_SH)
--
2.1.0.346.ga0367b9
next prev parent reply other threads:[~2014-08-22 4:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 21:58 [PATCH] Update hard-coded header dependencies Jonathan Nieder
2014-08-10 19:48 ` Jeff King
2014-08-21 8:24 ` Jeff King
2014-08-21 8:29 ` [PATCH 1/2] Makefile: use "find" to determine static " Jeff King
2014-08-21 14:48 ` Jonathan Nieder
2014-08-22 4:12 ` Jeff King
2014-08-22 4:27 ` [PATCH v2 0/3] dropping manually-maintained LIB_H Jeff King
2014-08-22 4:32 ` Jeff King [this message]
2014-08-22 4:33 ` [PATCH 2/3] Makefile: use `find` to determine static header dependencies Jeff King
2014-08-25 19:30 ` Junio C Hamano
2014-08-25 19:33 ` Jeff King
2014-08-25 19:46 ` Jonathan Nieder
2014-08-25 20:00 ` Jeff King
2014-08-25 20:09 ` Jeff King
2014-08-25 20:45 ` Jonathan Nieder
2014-08-25 21:03 ` Junio C Hamano
2014-08-25 21:27 ` Jonathan Nieder
2014-08-25 22:08 ` Junio C Hamano
2014-08-26 12:34 ` Jeff King
2014-08-26 16:54 ` Junio C Hamano
2014-08-26 17:29 ` Jeff King
2014-08-26 19:40 ` Junio C Hamano
2014-08-22 4:33 ` [PATCH 3/3] Makefile: drop CHECK_HEADER_DEPENDENCIES code Jeff King
2014-08-23 11:06 ` [PATCH 1/2] Makefile: use "find" to determine static header dependencies Jiang Xin
2014-08-21 8:31 ` [PATCH 2/2] Makefile: drop CHECK_HEADER_DEPENDENCIES code Jeff King
2014-08-10 23:31 ` [PATCH] Update hard-coded header dependencies Junio C Hamano
2014-08-10 23:39 ` Junio C Hamano
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=20140822043208.GA18192@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=worldhello.net@gmail.com \
/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).