[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Fri, 15 Nov 2024 18:35:54 -0500 (EST) |
branch: master
commit 85bf5abf20f8256a3e7358b88dbae6c234fd16fe
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Nov 16 00:35:34 2024 +0100
* tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES)
(xs_LTLIBRARIES, libtexinfo_convertxs_la_SOURCES)
(libtexinfo_convertxs_la_CPPFLAGS)
(libtexinfo_convertxs_la_CFLAGS, libtexinfo_convertxs_la_LIBADD)
(libtexinfo_convertxs_la_LDFLAGS, IndicesXS_la_LIBADD)
(ConvertXS_la_LIBADD): add the libtexinfo-convertxs.la shared library
with code common for XS interfaces used to call libtexinfo-convert.
Remove XS_libtexinfo_convert_sources.
* tp/Texinfo/XS/convert/build_html_perl_info.c,
tp/Texinfo/XS/convert/get_converter_perl_info.c: remove config.h
include, the Perl C files do not need Gnulib function nor autoconf
defines.
---
ChangeLog | 48 ++++++++++++++++---------
tp/Texinfo/XS/Makefile.am | 34 +++++++++++++-----
tp/Texinfo/XS/convert/build_html_perl_info.c | 6 ----
tp/Texinfo/XS/convert/get_converter_perl_info.c | 2 --
4 files changed, 57 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b923abe7fa..d2be72ba0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,21 +1,18 @@
-2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
-
- * tp/t/formats_encodings.t (accented_character_in_file_name):
- remove test
-
-2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
-
- * tp/tests/input/non_ascii: New directory to centralise location
- of files with non-ASCII names
-
- * tp/tests/run_parser_all.sh: specify -I $srcdir/input/non_ascii
- on texi2any command line
+2024-11-15 Patrice Dumas <pertusus@free.fr>
-2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
+ * tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES)
+ (xs_LTLIBRARIES, libtexinfo_convertxs_la_SOURCES)
+ (libtexinfo_convertxs_la_CPPFLAGS)
+ (libtexinfo_convertxs_la_CFLAGS, libtexinfo_convertxs_la_LIBADD)
+ (libtexinfo_convertxs_la_LDFLAGS, IndicesXS_la_LIBADD)
+ (ConvertXS_la_LIBADD): add the libtexinfo-convertxs.la shared library
+ with code common for XS interfaces used to call libtexinfo-convert.
+ Remove XS_libtexinfo_convert_sources.
- * tp/tests/many_input_files/Makefile.am:
- Remove use of LONG_TESTS variable (same change made in
- tp/tests/Makefile.am on 2016-10-23 but this file was missed).
+ * tp/Texinfo/XS/convert/build_html_perl_info.c,
+ tp/Texinfo/XS/convert/get_converter_perl_info.c: remove config.h
+ include, the Perl C files do not need Gnulib function nor autoconf
+ defines.
2024-11-15 Patrice Dumas <pertusus@free.fr>
@@ -65,6 +62,25 @@
* tp/Texinfo/XS/convert/build_html_perl_state.c: make
build_html_translated_names static.
+2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/t/formats_encodings.t (accented_character_in_file_name):
+ remove test
+
+2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/input/non_ascii: New directory to centralise location
+ of files with non-ASCII names
+
+ * tp/tests/run_parser_all.sh: specify -I $srcdir/input/non_ascii
+ on texi2any command line
+
+2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/many_input_files/Makefile.am:
+ Remove use of LONG_TESTS variable (same change made in
+ tp/tests/Makefile.am on 2016-10-23 but this file was missed).
+
2024-11-15 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/html_prepare_converter.c
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index d1081a3882..c90f50777f 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -465,15 +465,9 @@ libxs_in_libtexinfo_convert_la_CFLAGS = $(XSLIBS_CFLAGS)
libxs_in_libtexinfo_convert_la_LIBADD = libtexinfoxs.la libtexinfo.la
$(platform_PERL_LIBADD)
libxs_in_libtexinfo_convert_la_LDFLAGS = $(perl_conf_LDFLAGS)
-XS_libtexinfo_convert_sources = \
- convert/build_html_perl_info.h \
- convert/build_html_perl_info.c \
- convert/get_converter_perl_info.c \
- convert/get_converter_perl_info.h
libtexinfo_convert_la_SOURCES = \
- $(C_libtexinfo_convert_sources) \
- $(XS_libtexinfo_convert_sources)
+ $(C_libtexinfo_convert_sources)
# locate include files under out-of-source builds.
# parsetexi is only needed for texinfo.c
@@ -485,6 +479,28 @@ libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0
$(perl_conf_LDFLAGS) $(EUIDA
#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
+
+if HAVE_ICONV
+xs_LTLIBRARIES += libtexinfo-convertxs.la
+endif
+
+libtexinfo_convertxs_la_SOURCES = \
+ convert/build_html_perl_info.h \
+ convert/build_html_perl_info.c \
+ convert/get_converter_perl_info.c \
+ convert/get_converter_perl_info.h
+
+# locate include files under out-of-source builds.
+libtexinfo_convertxs_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert
$(AM_CPPFLAGS) $(XSLIBS_CPPFLAGS)
+libtexinfo_convertxs_la_CFLAGS = $(XSLIBS_CFLAGS)
+libtexinfo_convertxs_la_LIBADD = libtexinfo-convert.la libtexinfoxs.la
libtexinfo.la $(platform_PERL_LIBADD)
+# example to trigger errors associated with no undefined
+#libtexinfo_convertxs_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined
$(perl_conf_LDFLAGS) $(PERL_LIBS) $(LTLIBINTL)
+libtexinfo_convertxs_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS)
$(LTLIBINTL)
+
+
########################## Parsetexi XS parser
converterdatadir = $(datadir)/$(CONVERTER)
@@ -559,7 +575,7 @@ EXTRA_DIST += main/IndicesXS.xs
# locate include files under out-of-source builds.
IndicesXS_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert $(AM_CPPFLAGS)
$(XSLIBS_CPPFLAGS)
IndicesXS_la_CFLAGS = $(XSLIBS_CFLAGS)
-IndicesXS_la_LIBADD = libtexinfoxs.la libtexinfo-convert.la libtexinfo.la
$(top_builddir)/gnulib/lib/libgnu.la $(platform_PERL_LIBADD)
+IndicesXS_la_LIBADD = libtexinfo-convertxs.la libtexinfoxs.la
libtexinfo-convert.la libtexinfo.la $(top_builddir)/gnulib/lib/libgnu.la
$(platform_PERL_LIBADD)
IndicesXS_la_LDFLAGS = $(XSLIBS_LDFLAGS) $(LTLIBICONV) $(LTLIBUNISTRING)
#IndicesXS_la_LDFLAGS = -Wl,--no-undefined $(XSLIBS_LDFLAGS)
$(perl_conf_PERL_LINK) $(LTLIBICONV) $(LTLIBUNISTRING)
@@ -581,7 +597,7 @@ EXTRA_DIST += convert/ConvertXS.xs
# To locate include files under out-of-source builds.
ConvertXS_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/structuring_transfo
-I$(srcdir)/convert $(AM_CPPFLAGS) $(XSLIBS_CPPFLAGS)
ConvertXS_la_CFLAGS = $(XSLIBS_CFLAGS)
-ConvertXS_la_LIBADD = libtexinfoxs.la libtexinfo-convert.la libtexinfo.la
$(top_builddir)/gnulib/lib/libgnu.la $(platform_PERL_LIBADD)
+ConvertXS_la_LIBADD = libtexinfo-convertxs.la libtexinfoxs.la
libtexinfo-convert.la libtexinfo.la $(top_builddir)/gnulib/lib/libgnu.la
$(platform_PERL_LIBADD)
ConvertXS_la_LDFLAGS = $(XSLIBS_LDFLAGS) $(LTLIBICONV) $(LTLIBUNISTRING)
diff --git a/tp/Texinfo/XS/convert/build_html_perl_info.c
b/tp/Texinfo/XS/convert/build_html_perl_info.c
index 455e5a874b..9839f2bc94 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_info.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_info.c
@@ -13,8 +13,6 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include <config.h>
-
#include <string.h>
#include <stdio.h>
@@ -24,10 +22,6 @@
#define PERL_NO_GET_CONTEXT
#include "EXTERN.h"
#include "perl.h"
-#if defined _WIN32 && !defined __CYGWIN__
-/* See comment in Parsetexi.xs for why we #undef free. */
- #undef free
-#endif
#include "XSUB.h"
#undef context
diff --git a/tp/Texinfo/XS/convert/get_converter_perl_info.c
b/tp/Texinfo/XS/convert/get_converter_perl_info.c
index 9913acb5a9..baca04708f 100644
--- a/tp/Texinfo/XS/convert/get_converter_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_converter_perl_info.c
@@ -13,8 +13,6 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include <config.h>
-
#include <stdlib.h>
#include <stdio.h>