branch master updated: * tp/Texinfo/XS/Makefile.am: move XS interfaces that do not need libtexinfo-convert before libtexinfo-convert.

[Patrice Dumas]

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 dd3ec49d70 * tp/Texinfo/XS/Makefile.am: move XS interfaces that do not 
need libtexinfo-convert before libtexinfo-convert.
dd3ec49d70 is described below

commit dd3ec49d70d3661029d0c8500b84db6cc32c6820
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Nov 16 00:40:23 2024 +0100

    * tp/Texinfo/XS/Makefile.am: move XS interfaces that do not need
    libtexinfo-convert before libtexinfo-convert.
---
 ChangeLog                 |   5 ++
 tp/Texinfo/XS/Makefile.am | 120 +++++++++++++++++++++++-----------------------
 2 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2be72ba0d..fc9a0827f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-11-15  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/Makefile.am: move XS interfaces that do not need
+       libtexinfo-convert before libtexinfo-convert.
+
 2024-11-15  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES)
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index c90f50777f..c8508fe332 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -386,9 +386,8 @@ $(srcdir)/main/html_conversion_data.c 
$(srcdir)/main/html_conversion_data.h: mai
 MAINTAINERCLEANFILES += main/html_conversion_data.c main/html_conversion_data.h
 
 
-########################## shared perl XS library for texinfo XS codes
-# it is separate from libtexinfo because of different dependencies; it
-# does not depend on gnulib.  Both libraries are used by following XS.
+################################# common Perl C code used to call
+# libtexinfo from Perl XS *.xs interfaces and other Perl C codes shared library
 
 if HAVE_ICONV
 xs_LTLIBRARIES += libtexinfoxs.la
@@ -409,6 +408,63 @@ libtexinfoxs_la_LIBADD = libtexinfo.la libxsutils.la 
$(platform_PERL_LIBADD)
 #libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined 
$(perl_conf_LDFLAGS) $(PERL_LIBS) $(LTLIBINTL)
 libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) $(LTLIBINTL)
 
+########################## Parsetexi XS parser
+
+converterdatadir = $(datadir)/$(CONVERTER)
+modulesdir = $(converterdatadir)/Texinfo/XS/parsetexi
+dist_modules_DATA = parsetexi/Parsetexi.pm
+
+if HAVE_ICONV
+xs_LTLIBRARIES += Parsetexi.la
+endif
+
+nodist_Parsetexi_la_SOURCES = parsetexi/Parsetexi.c
+CLEANFILES += parsetexi/Parsetexi.c
+
+EXTRA_DIST += parsetexi/Parsetexi.xs
+
+# To locate include files under out-of-source builds.
+Parsetexi_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/parsetexi $(AM_CPPFLAGS) 
$(XSLIBS_CPPFLAGS)
+Parsetexi_la_CFLAGS = $(XSLIBS_CFLAGS)
+Parsetexi_la_LIBADD = libtexinfoxs.la libtexinfo.la $(platform_PERL_LIBADD)
+Parsetexi_la_LDFLAGS = $(XSLIBS_LDFLAGS)
+
+########################## Document XS
+
+if HAVE_ICONV
+xs_LTLIBRARIES += DocumentXS.la
+endif
+
+nodist_DocumentXS_la_SOURCES = main/DocumentXS.c
+CLEANFILES += main/DocumentXS.c
+
+EXTRA_DIST += main/DocumentXS.xs
+
+# locate include files under out-of-source builds.
+DocumentXS_la_CPPFLAGS = -I$(srcdir)/main $(AM_CPPFLAGS) $(XSLIBS_CPPFLAGS)
+DocumentXS_la_CFLAGS = $(XSLIBS_CFLAGS)
+DocumentXS_la_LIBADD = libtexinfoxs.la libtexinfo.la 
$(top_builddir)/gnulib/lib/libgnu.la $(platform_PERL_LIBADD)
+DocumentXS_la_LDFLAGS = $(XSLIBS_LDFLAGS) $(LTLIBICONV) $(LTLIBUNISTRING)
+
+########################## StructuringTransfo XS
+
+if HAVE_ICONV
+xs_LTLIBRARIES += StructuringTransfoXS.la
+endif
+
+nodist_StructuringTransfoXS_la_SOURCES = \
+                    structuring_transfo/StructuringTransfoXS.c
+CLEANFILES += \
+                    structuring_transfo/StructuringTransfoXS.c
+
+EXTRA_DIST += structuring_transfo/StructuringTransfoXS.xs
+
+# locate include files under out-of-source builds.
+StructuringTransfoXS_la_CPPFLAGS = -I$(srcdir)/main 
-I$(srcdir)/structuring_transfo $(AM_CPPFLAGS) $(XSLIBS_CPPFLAGS)
+StructuringTransfoXS_la_CFLAGS = $(XSLIBS_CFLAGS)
+StructuringTransfoXS_la_LIBADD = libtexinfoxs.la libtexinfo.la 
$(top_builddir)/gnulib/lib/libgnu.la $(platform_PERL_LIBADD)
+StructuringTransfoXS_la_LDFLAGS = $(XSLIBS_LDFLAGS) $(LTLIBICONV) 
$(LTLIBUNISTRING)
+
 
 ########################## shared C library for conversion
 # conversion to raw text and to Texinfo code is in the libtexinfo library.
@@ -478,7 +534,6 @@ libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0 
$(perl_conf_LDFLAGS) $(EUIDA
 # example to trigger errors associated with no undefined
 #libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined 
$(perl_conf_LDFLAGS) $(perl_conf_PERL_LINK) $(EUIDACCESS_LIBGEN) $(LTLIBINTL) 
$(LTLIBICONV) $(LTLIBUNISTRING)
 
-
 ################################# common Perl C code used to call
 # libtexinfo-convert from Perl XS *.xs interfaces shared library
 
@@ -501,63 +556,6 @@ libtexinfo_convertxs_la_LIBADD = libtexinfo-convert.la 
libtexinfoxs.la libtexinf
 libtexinfo_convertxs_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) 
$(LTLIBINTL)
 
 
-########################## Parsetexi XS parser
-
-converterdatadir = $(datadir)/$(CONVERTER)
-modulesdir = $(converterdatadir)/Texinfo/XS/parsetexi
-dist_modules_DATA = parsetexi/Parsetexi.pm
-
-if HAVE_ICONV
-xs_LTLIBRARIES += Parsetexi.la
-endif
-
-nodist_Parsetexi_la_SOURCES = parsetexi/Parsetexi.c
-CLEANFILES += parsetexi/Parsetexi.c
-
-EXTRA_DIST += parsetexi/Parsetexi.xs
-
-# To locate include files under out-of-source builds.
-Parsetexi_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/parsetexi $(AM_CPPFLAGS) 
$(XSLIBS_CPPFLAGS)
-Parsetexi_la_CFLAGS = $(XSLIBS_CFLAGS)
-Parsetexi_la_LIBADD = libtexinfoxs.la libtexinfo.la $(platform_PERL_LIBADD)
-Parsetexi_la_LDFLAGS = $(XSLIBS_LDFLAGS)
-
-########################## Document XS
-
-if HAVE_ICONV
-xs_LTLIBRARIES += DocumentXS.la
-endif
-
-nodist_DocumentXS_la_SOURCES = main/DocumentXS.c
-CLEANFILES += main/DocumentXS.c
-
-EXTRA_DIST += main/DocumentXS.xs
-
-# locate include files under out-of-source builds.
-DocumentXS_la_CPPFLAGS = -I$(srcdir)/main $(AM_CPPFLAGS) $(XSLIBS_CPPFLAGS)
-DocumentXS_la_CFLAGS = $(XSLIBS_CFLAGS)
-DocumentXS_la_LIBADD = libtexinfoxs.la libtexinfo.la 
$(top_builddir)/gnulib/lib/libgnu.la $(platform_PERL_LIBADD)
-DocumentXS_la_LDFLAGS = $(XSLIBS_LDFLAGS) $(LTLIBICONV) $(LTLIBUNISTRING)
-
-########################## StructuringTransfo XS
-
-if HAVE_ICONV
-xs_LTLIBRARIES += StructuringTransfoXS.la
-endif
-
-nodist_StructuringTransfoXS_la_SOURCES = \
-                    structuring_transfo/StructuringTransfoXS.c
-CLEANFILES += \
-                    structuring_transfo/StructuringTransfoXS.c
-
-EXTRA_DIST += structuring_transfo/StructuringTransfoXS.xs
-
-# locate include files under out-of-source builds.
-StructuringTransfoXS_la_CPPFLAGS = -I$(srcdir)/main 
-I$(srcdir)/structuring_transfo $(AM_CPPFLAGS) $(XSLIBS_CPPFLAGS)
-StructuringTransfoXS_la_CFLAGS = $(XSLIBS_CFLAGS)
-StructuringTransfoXS_la_LIBADD = libtexinfoxs.la libtexinfo.la 
$(top_builddir)/gnulib/lib/libgnu.la $(platform_PERL_LIBADD)
-StructuringTransfoXS_la_LDFLAGS = $(XSLIBS_LDFLAGS) $(LTLIBICONV) 
$(LTLIBUNISTRING)
-
 ########################## IndicesXS
 
 if HAVE_ICONV