diff options
| author | Alan Modra <amodra@gmail.com> | 2018-02-24 18:50:21 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2018-02-26 10:51:12 +1030 |
| commit | 33589acbfea909ca2a26b977ff2f672332990747 (patch) | |
| tree | c7f59a4a02311e08068b1defd4a5998b8eecff9c /ld/Makefile.in | |
| parent | e95b887f85a192eb1597cd5d358673520029ad14 (diff) | |
| download | binutils-gdb-33589acbfea909ca2a26b977ff2f672332990747.tar.gz | |
ld message translation for emultempl and emulparams
Most of the emultempl/*.em error/warning messages do not currently
appear in ld.pot, and fixing that is not simply a matter of adding
missing files to POTFILES. The difficulty is the shell-script
quoting, for example aarch64elf.em:PARSE_AND_LIST_OPTIONS "Don'\''t".
I suppose you could avoid contractions like "don't" but I'm unsure as
to whether gettext could handle everything in the emulparams scripts.
The right thing to do is feed the generated C files to gettext, as
this patch does. The patch just copies what is already done in bfd/
for generated files.
* Makefile.am (EMULATION_FILES, POTFILES): Delete.
(SRC_POTFILES, BLD_POTFILES): Define.
(po/POTFILES.in): Delete rule.
(po/SRC-POTFILES.in, po/BLD-POTFILES.in): New rules.
* configure.ac: Add AC_CONFIG_COMMANDS to create po/Makefile.
* po/Make-in (DISTFILES): Remove POTFILES.in, add SRC-POTFILES.in
and BLD-POTFILES.in.
(POTFILES): Delete.
(SRC-POTFILES, BLD-POTFILES): Define place marker.
(ld.pot): Build from SRC-POTFILES plus BLD-POTFILES.
(distclean, maintainer-clean): Tidy up new files.
(POTFILES, POTFILES.in): Delete rules.
(SRC-POTFILES, BLD-POTFILES, SRC-POTFILES.in, BLD-POTFILES.in):
New rules.
(Makefile): Depend on SRC-POTFILES and BLD-POTFILES.
* po/SRC-POTFILES.in: Rename from po/POTFILES.in.
* po/BLD-POTFILES.in: New file.
* Makefile.in: Regenerate.
* configure: Regenerate.
Diffstat (limited to 'ld/Makefile.in')
| -rw-r--r-- | ld/Makefile.in | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ld/Makefile.in b/ld/Makefile.in index 760c037f9d9..704694b2ca4 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -917,11 +917,8 @@ OFILES = ldgram.@OBJEXT@ ldlex-wrapper.@OBJEXT@ lexsup.@OBJEXT@ ldlang.@OBJEXT@ ldbuildid.@OBJEXT@ STAGESTUFF = *.@OBJEXT@ ldscripts/* e*.c - -# At the moment this is just a list of those emulation template files -# that contain internationalised strings. -EMULATION_FILES = emultempl/pe.em emultempl/armcoff.em -POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES) +SRC_POTFILES = $(CFILES) $(HFILES) +BLD_POTFILES = $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES) # These all start with e so 'make clean' can find them. GENSCRIPTS = LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ @enable_initfini_array@ @@ -2188,9 +2185,13 @@ deffilep.@OBJEXT@: deffilep.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f deffilep.c || echo $(srcdir)/`deffilep.c $(NO_WERROR) -po/POTFILES.in: @MAINT@ Makefile - for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ - && mv tmp $(srcdir)/po/POTFILES.in +po/SRC-POTFILES.in: @MAINT@ Makefile + for f in $(SRC_POTFILES); do echo $$f; done | LC_ALL=C sort > $@-tmp \ + && mv $@-tmp $(srcdir)/po/SRC-POTFILES.in + +po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES) + for f in $(BLD_POTFILES); do echo $$f; done | LC_ALL=C sort > $@-tmp \ + && mv $@-tmp $(srcdir)/po/BLD-POTFILES.in ldmain.@OBJEXT@: ldmain.c config.status @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ \ |