[PATCH 2/9] Makefile: generate "po/git.pot" from stable LOCALIZED_C
- From
Jiang Xin <worldhello.net@gmail.com>
- Date
- May 3, 2022, 13:23 UTC
- Message-ID
- <20220503132354.9567-3-worldhello.net@gmail.com>
- In-Reply-To
- <20220503132354.9567-1-worldhello.net@gmail.com>
From: Jiang Xin <zhiyou.jx@alibaba-inc.com>
When running "make pot" on different platform, we may get a different message template file "po/git.pot". This is because the "LOCALIZED_C" variable may have different C source files on different platforms or different compiler conditions.
We can make a stable "LOCALIZED_C" variable by applying patch snippets as follows:
ifdef NO_LIBGEN_H
COMPAT_CFLAGS += -DNO_LIBGEN_H
COMPAT_OBJS += compat/basename.o
+else
+ LOCALIZED_C += compat/basename.c
endifBut it is much simpler to use variables "$(FOUND_C_SOURCES)" and "$(FOUND_C_SOURCES)" to form a stable "LOCALIZED_C".
With this update, the newly generated "po/git.pot" will have 30 new entries coming from the following C source files:
* compat/fsmonitor/fsm-listen-win32.c * compat/mingw.c * compat/regex/regcomp.c * compat/simple-ipc/ipc-win32.c
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 83e968e2a4..60ca42c268 100644 --- a/Makefile +++ b/Makefile @@ -2714,7 +2714,8 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ --keyword=gettextln --keyword=eval_gettextln XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \ --keyword=__ --keyword=N__ --keyword="__n:1,2" -LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H) +LOCALIZED_C = $(FOUND_C_SOURCES) $(SCALAR_SOURCES) \ + $(FOUND_H_SOURCES) $(GENERATED_H) LOCALIZED_SH = $(SCRIPT_SH) LOCALIZED_SH += git-sh-setup.sh LOCALIZED_PERL = $(SCRIPT_PERL)
-- 2.35.1.577.g74cc1aa55f