[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Thu, 3 Oct 2024 15:30:02 -0400 (EDT) |
branch: master
commit 3425b4cc7403725799603a9d46fcc87f9ac65c5a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Oct 3 21:28:00 2024 +0200
* tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources)
(XS_libtexinfo_sources, libtexinfo_la_SOURCES)
(C_libtexinfo_convert_sources, XS_libtexinfo_convert_sources)
(libtexinfo_convert_la_SOURCES): separate libtexinfo_la_SOURCES and
libtexinfo_convert_la_SOURCES in C and XS code using variables.
* tp/Texinfo/XS/Makefile.am (teximakehtml_SOURCES)
(teximakehtml_LDADD): list libtexinfo and libtexinfo_convert C code
files using the variables instead of lining against the libraries.
---
ChangeLog | 20 ++++++++++++++++----
tp/Texinfo/XS/Makefile.am | 33 ++++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 50a28ddf5f..af023a64e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
2024-10-03 Patrice Dumas <pertusus@free.fr>
- * NEWS, tp/Texinfo/Convert/Plaintext.pm (_convert_def_line): use a ---
- for definition line leading hyphen to end up with two hyphen in the
- default case as was the case previously. See
- https://lists.gnu.org/archive/html/bug-texinfo/2004-02/msg00021.html
+ * tp/Texinfo/XS/Makefile.am (C_libtexinfo_sources)
+ (XS_libtexinfo_sources, libtexinfo_la_SOURCES)
+ (C_libtexinfo_convert_sources, XS_libtexinfo_convert_sources)
+ (libtexinfo_convert_la_SOURCES): separate libtexinfo_la_SOURCES and
+ libtexinfo_convert_la_SOURCES in C and XS code using variables.
+
+ * tp/Texinfo/XS/Makefile.am (teximakehtml_SOURCES)
+ (teximakehtml_LDADD): list libtexinfo and libtexinfo_convert C code
+ files using the variables instead of lining against the libraries.
2024-08-07 Patrice Dumas <pertusus@free.fr>
@@ -59,6 +64,13 @@
all, the intent is to use the program as a demonstrator of how the C
code could be used separately from Perl.
+2024-10-03 Patrice Dumas <pertusus@free.fr>
+
+ * NEWS, tp/Texinfo/Convert/Plaintext.pm (_convert_def_line): use a ---
+ for definition line leading hyphen to end up with two hyphen in the
+ default case as was the case previously. See
+ https://lists.gnu.org/archive/html/bug-texinfo/2004-02/msg00021.html
+
2024-08-07 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/document.c (initialize_document_options): add
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 63f9742957..b667728675 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -110,9 +110,7 @@ endif
# in main but not the other way around.
# Files in structuring_transfo depend only on the files in main and not
# the other way around.
-# api_to_perl.c and call_perl_function.c functions are called in other
-# parts of the code and need to be linked against Perl
-libtexinfo_la_SOURCES= \
+C_libtexinfo_sources = \
main/tree_types.h \
main/document_types.h \
main/tree.c \
@@ -208,7 +206,11 @@ libtexinfo_la_SOURCES= \
structuring_transfo/structuring.c \
structuring_transfo/structuring.h \
structuring_transfo/transformations.c \
- structuring_transfo/transformations.h \
+ structuring_transfo/transformations.h
+
+# api_to_perl.c and call_perl_function.c functions are called in other
+# parts of the code and need to be linked against Perl
+XS_libtexinfo_sources = \
main/api_to_perl.c \
main/api_to_perl.h \
main/call_perl_function.c \
@@ -224,6 +226,10 @@ EXTRA_DIST += main/cmd_text.c
EXTRA_DIST += main/global_multi_commands_case.c
EXTRA_DIST += main/global_unique_commands_case.c
+libtexinfo_la_SOURCES = \
+ $(C_libtexinfo_sources) \
+ $(XS_libtexinfo_sources)
+
# locate include files under out-of-source builds.
libtexinfo_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/parsetexi $(AM_CPPFLAGS)
$(GNULIB_CPPFLAGS) $(XSLIBS_CPPFLAGS)
libtexinfo_la_CFLAGS = $(XSLIBS_CFLAGS)
@@ -370,7 +376,7 @@ endif
# call_html_perl_function.c functions are called in other
# parts of the code and need to be linked against Perl.
# build_html_perl_state.c functions are called from call_html_perl_function.c.
-libtexinfo_convert_la_SOURCES= \
+C_libtexinfo_convert_sources = \
convert/converter.c \
convert/converter.h \
convert/cmd_converter.c \
@@ -379,7 +385,9 @@ libtexinfo_convert_la_SOURCES= \
convert/converters_defaults.c \
convert/converters_defaults.h \
convert/html_converter_init_options.c \
- convert/html_converter_init_options.h \
+ convert/html_converter_init_options.h
+
+XS_libtexinfo_convert_sources = \
convert/build_html_perl_state.h \
convert/build_html_perl_state.c \
convert/call_html_perl_function.h \
@@ -387,6 +395,10 @@ libtexinfo_convert_la_SOURCES= \
convert/get_converter_perl_info.c \
convert/get_converter_perl_info.h
+libtexinfo_convert_la_SOURCES = \
+ $(C_libtexinfo_convert_sources) \
+ $(XS_libtexinfo_convert_sources)
+
# locate include files under out-of-source builds.
# parsetexi will only be needed for texinfo.c
libtexinfo_convert_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert
-I$(srcdir)/structuring_transfo -I$(srcdir)/parsetexi $(AM_CPPFLAGS)
$(GNULIB_CPPFLAGS) $(XSLIBS_CPPFLAGS)
@@ -500,12 +512,15 @@ ConvertXS_la_LDFLAGS = $(XSLIBS_LDFLAGS) $(LTLIBICONV)
$(LTLIBUNISTRING)
noinst_PROGRAMS = teximakehtml
-teximakehtml_SOURCES = teximakehtml.c \
+teximakehtml_SOURCES = \
+ $(C_libtexinfo_sources) \
+ $(C_libtexinfo_convert_sources) \
+ teximakehtml.c \
main/replace_perl_api_call.c \
convert/replace_perl_call_html_function.c
teximakehtml_CPPFLAGS = -I$(srcdir)/parsetexi -I$(srcdir)/convert
-I$(srcdir)/main -I$(srcdir)/structuring_transfo $(AM_CPPFLAGS)
$(GNULIB_CPPFLAGS)
-teximakehtml_LDFLAGS = $(XSLIBS_LDFLAGS)
-teximakehtml_LDADD = libtexinfo.la libtexinfo-convert.la
$(top_builddir)/gnulib/lib/libgnu.la
+#teximakehtml_LDADD = libtexinfo.la libtexinfo-convert.la
$(top_builddir)/gnulib/lib/libgnu.la
+teximakehtml_LDADD = $(top_builddir)/gnulib/lib/libgnu.la