From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCH 1/3] i18n: treat "make pot" as an explicitly-invoked target Date: Fri, 22 Aug 2014 00:32:08 -0400 Message-ID: <20140822043208.GA18192@peff.net> References: <20140822042716.GE27992@peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: git@vger.kernel.org, Jiang Xin To: Jonathan Nieder X-From: git-owner@vger.kernel.org Fri Aug 22 06:32:20 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XKgWM-0002fs-WD for gcvg-git-2@plane.gmane.org; Fri, 22 Aug 2014 06:32:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751732AbaHVEcL (ORCPT ); Fri, 22 Aug 2014 00:32:11 -0400 Received: from cloud.peff.net ([50.56.180.127]:56586 "HELO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752180AbaHVEcK (ORCPT ); Fri, 22 Aug 2014 00:32:10 -0400 Received: (qmail 1888 invoked by uid 102); 22 Aug 2014 04:32:10 -0000 Received: from c-71-63-4-13.hsd1.va.comcast.net (HELO sigill.intra.peff.net) (71.63.4.13) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Thu, 21 Aug 2014 23:32:10 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Fri, 22 Aug 2014 00:32:08 -0400 Content-Disposition: inline In-Reply-To: <20140822042716.GE27992@peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Jonathan Nieder 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 Signed-off-by: Jeff King --- 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