[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 22 Oct 2023 17:38:00 -0400 (EDT) |
branch: master
commit 3cc997243022ba94f63be1598b7568e29de380cd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 22 23:36:11 2023 +0200
* tp/Makefile.am (dist_modules_DATA, modules_DATA)
(Texinfo/Commands.pm, Texinfo/Options.pm)
(DISTCLEANFILES, MAINTAINERCLEANFILES), tp/Texinfo/XS/Makefile.am
(../Commands.pm, ../Options.pm): build Options.pm and Commands.pm
systematically in srcdir, as they are prerequisites for files in
scrdir in tp/Texinfo/XS for maintain/setup_converters_code_tables.pl.
For the same reason, distribute Commands.pm and Options.pm and put
them in MAINTAINERCLEANFILES, not DISTCLEANFILES.
* tp/Texinfo/XS/Makefile.am (cmd_normalization.c): add other files
built with the rule as targets.
* tp/Texinfo/XS/Makefile.am: remove $srcdir from prerequisites, they
should be found on VPATH.
---
ChangeLog | 17 +++++++++++++++++
tp/Makefile.am | 19 +++++++++----------
tp/Texinfo/XS/Makefile.am | 10 +++++-----
3 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 98a2fc8f27..a0bd294df0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2023-10-22 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.am (dist_modules_DATA, modules_DATA)
+ (Texinfo/Commands.pm, Texinfo/Options.pm)
+ (DISTCLEANFILES, MAINTAINERCLEANFILES), tp/Texinfo/XS/Makefile.am
+ (../Commands.pm, ../Options.pm): build Options.pm and Commands.pm
+ systematically in srcdir, as they are prerequisites for files in
+ scrdir in tp/Texinfo/XS for maintain/setup_converters_code_tables.pl.
+ For the same reason, distribute Commands.pm and Options.pm and put
+ them in MAINTAINERCLEANFILES, not DISTCLEANFILES.
+
+ * tp/Texinfo/XS/Makefile.am (cmd_normalization.c): add other files
+ built with the rule as targets.
+
+ * tp/Texinfo/XS/Makefile.am: remove $srcdir from prerequisites, they
+ should be found on VPATH.
+
2023-10-22 Patrice Dumas <pertusus@free.fr>
* man/Makefile.am (generated_mans, MAINTAINERCLEANFILES): distinguish
diff --git a/tp/Makefile.am b/tp/Makefile.am
index a294ea2b9c..e3132f657e 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -67,10 +67,12 @@ dist_modules_DATA = \
Texinfo/Config.pm \
Texinfo/Common.pm \
Texinfo/Commands.pod \
+ Texinfo/Commands.pm \
Texinfo/DebugTree.pm \
Texinfo/Document.pm \
Texinfo/Documentlanguages.pm \
Texinfo/MiscXS.pm \
+ Texinfo/Options.pm \
Texinfo/Parser.pm \
Texinfo/ParserNonXS.pm \
Texinfo/Report.pm \
@@ -85,9 +87,7 @@ dist_noinst_DATA = \
Texinfo/ModulePath.pm.in
modules_DATA = \
- Texinfo/ModulePath.pm \
- Texinfo/Commands.pm \
- Texinfo/Options.pm
+ Texinfo/ModulePath.pm
convertersdir = $(pkgdatadir)/Texinfo/Convert
dist_converters_DATA = \
@@ -347,13 +347,11 @@ Texinfo/ModulePath.pm: Texinfo/ModulePath.pm.in Makefile
$(srcdir)/Texinfo/ModulePath.pm.in >$@
# FIXME duplicated in Texinfo/XS/Makefile.am. Remove from here?
-Texinfo/Commands.pm: Texinfo/command_data.txt
- $(MKDIR_P) Texinfo
- $(srcdir)/maintain/regenerate_commands_perl_info.pl Texinfo/Commands.pm
< $(srcdir)/Texinfo/command_data.txt
+$(srcdir)/Texinfo/Commands.pm: Texinfo/command_data.txt
+ $(srcdir)/maintain/regenerate_commands_perl_info.pl
$(srcdir)/Texinfo/Commands.pm < $(srcdir)/Texinfo/command_data.txt
-Texinfo/Options.pm: Texinfo/options_data.txt
- $(MKDIR_P) Texinfo
- $(srcdir)/maintain/regenerate_perl_options_info.pl Texinfo/Options.pm <
$(srcdir)/Texinfo/options_data.txt
+$(srcdir)/Texinfo/Options.pm: Texinfo/options_data.txt
+ $(srcdir)/maintain/regenerate_perl_options_info.pl
$(srcdir)/Texinfo/Options.pm < $(srcdir)/Texinfo/options_data.txt
libsrcdir = $(srcdir)/maintain/lib
@@ -399,4 +397,5 @@ distclean-local:
rm -rf po po_document
CLEANFILES = texi2any makeinfo Texinfo/ModulePath.pm
-DISTCLEANFILES = maintain/catalog.xml Texinfo/Commands.pm Texinfo/Options.pm
+DISTCLEANFILES = maintain/catalog.xml
+MAINTAINERCLEANFILES = Texinfo/Commands.pm Texinfo/Options.pm
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index ec998d96f6..d2f9e90a54 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -239,14 +239,14 @@ $(srcdir)/main/command_data.c
$(srcdir)/main/command_ids.h $(srcdir)/main/global
$(srcdir)/../command_data.txt
# NOTE duplicate of a rule in ../../Makefile.am
-$(srcdir)/../Commands.pm: $(srcdir)/../command_data.txt
- $(PERL) $(srcdir)/../../maintain/regenerate_commands_perl_info.pl
../Commands.pm < $(srcdir)/../command_data.txt
+$(srcdir)/../Commands.pm: ../command_data.txt
+ $(PERL) $(srcdir)/../../maintain/regenerate_commands_perl_info.pl
$(srcdir)/../Commands.pm < $(srcdir)/../command_data.txt
# NOTE duplicate of a rule in ../../Makefile.am
$(srcdir)/../Options.pm: $(srcdir)/../options_data.txt
- $(PERL) $(srcdir)/../../maintain/regenerate_perl_options_info.pl
../Options.pm < $(srcdir)/../options_data.txt
+ $(PERL) $(srcdir)/../../maintain/regenerate_perl_options_info.pl
$(srcdir)/../Options.pm < $(srcdir)/../options_data.txt
-$(srcdir)/main/cmd_normalization.c: $(srcdir)/main/command_data.c
$(srcdir)/../Commands.pm $(srcdir)/../Options.pm
+$(srcdir)/main/cmd_normalization.c $(srcdir)/main/cmd_unicode.c
$(srcdir)/main/cmd_structuring.c $(srcdir)/main/cmd_symbol.c
$(srcdir)/main/cmd_text.c: main/command_data.c ../Commands.pm ../Options.pm
$(TXI_MODULES_ENV) $(PERL)
$(srcdir)/../../maintain/setup_converters_code_tables.pl \
< $(srcdir)/main/command_data.c \
$(srcdir)/main/cmd_normalization.c \
@@ -259,7 +259,7 @@ $(srcdir)/main/accent_tables_8bit_codepoints.c:
$(TXI_MODULES_ENV) $(PERL)
$(srcdir)/../../maintain/setup_accent_tables.pl \
$(srcdir)/main/accent_tables_8bit_codepoints.c
-$(srcdir)/main/options_init_free.c $(srcdir)/main/options_types.h
$(srcdir)/main/options_get_perl.c: $(srcdir)/../options_data.txt
$(srcdir)/main/command_data.c
+$(srcdir)/main/options_init_free.c $(srcdir)/main/options_types.h
$(srcdir)/main/options_get_perl.c: ../options_data.txt main/command_data.c
$(PERL) $(srcdir)/../../maintain/regenerate_C_options_info.pl \
< $(srcdir)/../options_data.txt \
$(srcdir)/main/command_data.c \