[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * Makefile.am (BUILT_SOURCES, tp/Texinfo/HTMLData
From: |
Patrice Dumas |
Subject: |
branch master updated: * Makefile.am (BUILT_SOURCES, tp/Texinfo/HTMLData.pm) (tp/Texinfo/XS/main/html_conversion_data.c), tp/Makefile.am (translated_source_files), tp/Texinfo/XS/Makefile.am (translated_source_files): build early generated source files that contain translated strings and are thus needed when building in po* directories. To help with that, add translated_source_files targets in Makefile.am of the generated source files directories such that it is easy to rebuild the files coming from any director [...] |
Date: |
Thu, 24 Oct 2024 16:49:35 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 3317a3cfc1 * Makefile.am (BUILT_SOURCES, tp/Texinfo/HTMLData.pm)
(tp/Texinfo/XS/main/html_conversion_data.c), tp/Makefile.am
(translated_source_files), tp/Texinfo/XS/Makefile.am (translated_source_files):
build early generated source files that contain translated strings and are thus
needed when building in po* directories. To help with that, add
translated_source_files targets in Makefile.am of the generated source files
directories such that it is easy to rebuild the files com [...]
3317a3cfc1 is described below
commit 3317a3cfc177d83fc7cead73963df587efab65f1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Oct 24 22:49:29 2024 +0200
* Makefile.am (BUILT_SOURCES, tp/Texinfo/HTMLData.pm)
(tp/Texinfo/XS/main/html_conversion_data.c), tp/Makefile.am
(translated_source_files), tp/Texinfo/XS/Makefile.am
(translated_source_files): build early generated source files that
contain translated strings and are thus needed when building in po*
directories. To help with that, add translated_source_files targets
in Makefile.am of the generated source files directories such that it
is easy to rebuild the files coming from any directory, in particular
from an out of source build directory.
---
ChangeLog | 12 ++++++++++++
Makefile.am | 10 ++++++++++
README-hacking | 2 +-
tp/Makefile.am | 5 +++++
tp/Texinfo/XS/Makefile.am | 5 +++++
5 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index ead855711c..0357dd79e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-10-24 Patrice Dumas <pertusus@free.fr>
+
+ * Makefile.am (BUILT_SOURCES, tp/Texinfo/HTMLData.pm)
+ (tp/Texinfo/XS/main/html_conversion_data.c), tp/Makefile.am
+ (translated_source_files), tp/Texinfo/XS/Makefile.am
+ (translated_source_files): build early generated source files that
+ contain translated strings and are thus needed when building in po*
+ directories. To help with that, add translated_source_files targets
+ in Makefile.am of the generated source files directories such that it
+ is easy to rebuild the files coming from any directory, in particular
+ from an out of source build directory.
+
2024-10-24 Gavin Smith <gavinsmith0123@gmail.com>
* README-hacking: suggest another distribution build check recipe
diff --git a/Makefile.am b/Makefile.am
index acd2fc8dbd..2bdad4f47a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,16 @@ BUILT_SOURCES = tp/Texinfo/ModulePath.pm
tp/Texinfo/ModulePath.pm:
cd tp && $(MAKE) $(AM_MAKEFLAGS) Texinfo/ModulePath.pm
+# Ensure that those files are built early, as they are needed in po*
+# directories. This allows to run configure and make after make distclean
+BUILT_SOURCES += $(top_srcdir)/tp/Texinfo/HTMLData.pm \
+ $(top_srcdir)/tp/Texinfo/XS/main/html_conversion_data.c
+$(top_srcdir)/tp/Texinfo/HTMLData.pm:
+ cd tp && $(MAKE) $(AM_MAKEFLAGS) translated_source_files
+
+$(top_srcdir)/tp/Texinfo/XS/main/html_conversion_data.c:
+ cd tp/Texinfo/XS && $(MAKE) $(AM_MAKEFLAGS) translated_source_files
+
# One special target for installers to use by hand if desired.
install-tex:
cd doc && $(MAKE) TEXMF=$(TEXMF) install-tex
diff --git a/README-hacking b/README-hacking
index d117b0a633..0f1076407b 100644
--- a/README-hacking
+++ b/README-hacking
@@ -401,7 +401,7 @@ make distclean
./configure
make dist
-# test make after maintainer-clean (doesn't work as of 2024-10-24)
+# test make after maintainer-clean
./configure
make maintainer-clean
./configure
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 8ef181bc96..cfd0d40a55 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -396,6 +396,11 @@ $(srcdir)/Texinfo/Options.pm:
Texinfo/Convert/converters_defaults.txt Texinfo/op
$(srcdir)/Texinfo/Options.pm \
< $(srcdir)/Texinfo/options_data.txt
+# target that can be built upon cd'ing to the build directory, as needed
+# when building translated source files from the top level directory to
+# avoid make failing in po* directories.
+translated_source_files: $(srcdir)/Texinfo/HTMLData.pm
+
$(srcdir)/Texinfo/HTMLData.pm:
Texinfo/Data/default_css_element_class_styles.csv
Texinfo/Data/default_direction_strings.csv
Texinfo/Data/default_special_unit_info.csv
Texinfo/Data/html_style_commands_element.csv
$(srcdir)/maintain/generate_code_convert_data.pl
$(srcdir)/maintain/generate_code_convert_data.pl \
$(srcdir)/Texinfo/Data/default_css_element_class_styles.csv \
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 24dcbf38cc..38d04a4505 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -338,6 +338,11 @@ MAINTAINERCLEANFILES += main/options_init_free.c
main/options_data.h \
convert/converters_options.h \
main/options_get_perl.c
+# target that can be built upon cd'ing to the build directory, as needed
+# when building translated source files from the top level directory to
+# avoid make failing in po* directories.
+translated_source_files: $(srcdir)/main/html_conversion_data.c
+
$(srcdir)/main/html_conversion_data.c $(srcdir)/main/html_conversion_data.h:
main/command_data.c $(srcdir)/../Data/default_css_element_class_styles.csv
$(srcdir)/../Data/default_direction_strings.csv
$(srcdir)/../Data/default_special_unit_info.csv
$(srcdir)/../Data/html_style_commands_element.csv
$(srcdir)/../../maintain/generate_code_convert_data.pl
$(PERL) $(srcdir)/../../maintain/generate_code_convert_data.pl \
< $(srcdir)/main/command_data.c \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * Makefile.am (BUILT_SOURCES, tp/Texinfo/HTMLData.pm) (tp/Texinfo/XS/main/html_conversion_data.c), tp/Makefile.am (translated_source_files), tp/Texinfo/XS/Makefile.am (translated_source_files): build early generated source files that contain translated strings and are thus needed when building in po* directories. To help with that, add translated_source_files targets in Makefile.am of the generated source files directories such that it is easy to rebuild the files coming from any director [...],
Patrice Dumas <=