texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/XS/Makefile.am (libtexinfoxs*): read


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/Makefile.am (libtexinfoxs*): readd mistakenly removed libtexinfoxs in conflicts resolution on 2024-10-02 "remove block of definition of libtexinfo_convert that crept in".
Date: Thu, 03 Oct 2024 02:27:41 -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 6a54111c84 * tp/Texinfo/XS/Makefile.am (libtexinfoxs*): readd 
mistakenly removed libtexinfoxs in conflicts resolution on 2024-10-02 "remove 
block of definition of libtexinfo_convert that crept in".
6a54111c84 is described below

commit 6a54111c84ecd0e1a604a2b89b3073b7bfaf7746
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Oct 3 08:27:43 2024 +0200

    * tp/Texinfo/XS/Makefile.am (libtexinfoxs*): readd mistakenly removed
    libtexinfoxs in conflicts resolution on 2024-10-02 "remove block of
    definition of libtexinfo_convert that crept in".
    
    * tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES): really
    add converter_options.c.
---
 ChangeLog                 |  9 +++++++++
 tp/Texinfo/XS/Makefile.am | 26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 621346350c..e5c096d934 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-10-03  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/Makefile.am (libtexinfoxs*): readd mistakenly removed
+       libtexinfoxs in conflicts resolution on 2024-10-02 "remove block of
+       definition of libtexinfo_convert that crept in".
+
+       * tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES): really
+       add converter_options.c.
+
 2024-08-04  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 f0e944885a..a7f7820ab3 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -332,6 +332,30 @@ $(srcdir)/main/conversion_data.c 
$(srcdir)/main/conversion_data.h: main/command_
 MAINTAINERCLEANFILES += main/conversion_data.c main/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.
+
+if HAVE_ICONV
+xs_LTLIBRARIES += libtexinfoxs.la
+endif
+
+libtexinfoxs_la_SOURCES= \
+                     main/build_perl_info.c \
+                     main/build_perl_info.h \
+                     main/get_perl_info.c \
+                     main/get_perl_info.h \
+                     main/options_get_perl.c
+
+# locate include files under out-of-source builds.
+libtexinfoxs_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert $(AM_CPPFLAGS) 
$(XSLIBS_CPPFLAGS)
+libtexinfoxs_la_CFLAGS = $(XSLIBS_CFLAGS)
+libtexinfoxs_la_LIBADD = libtexinfo.la
+# example to trigger errors associated with no undefined
+#libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined 
$(perl_conf_LDFLAGS) $(perl_conf_PERL_LINK) $(LTLIBINTL)
+libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) $(LTLIBINTL)
+
+
 ########################## shared C library for conversion
 # conversion to raw text and to Texinfo code is in the libtexinfo library.
 # Note that having a library and not reusing source files is important to
@@ -352,6 +376,8 @@ libtexinfo_convert_la_SOURCES= \
                        convert/convert_html.c \
                        convert/converters_defaults.c \
                        convert/converters_defaults.h \
+                       convert/converter_options.c \
+                       convert/converter_options.h \
                        convert/build_html_perl_state.h \
                        convert/build_html_perl_state.c \
                        convert/call_html_perl_function.h \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]