[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/Makefile.am: change order of xs_L
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/XS/Makefile.am: change order of xs_LTLIBRARIES for relinking in make distcheck. |
Date: |
Sun, 22 Sep 2024 13:35:44 -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 c8c1a4ad57 * tp/Texinfo/XS/Makefile.am: change order of xs_LTLIBRARIES
for relinking in make distcheck.
c8c1a4ad57 is described below
commit c8c1a4ad57495e7850a84fc28a19be573099ce82
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Sep 22 19:35:48 2024 +0200
* tp/Texinfo/XS/Makefile.am: change order of xs_LTLIBRARIES for
relinking in make distcheck.
---
ChangeLog | 5 +++++
tp/Texinfo/XS/Makefile.am | 47 ++++++++++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c5e38dc8a6..70a5298a3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-09-22 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/Makefile.am: change order of xs_LTLIBRARIES for
+ relinking in make distcheck.
+
2024-09-22 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/get_converter_perl_info.c (get_sv_converter)
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 33a07f870b..587e430b7a 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -298,6 +298,30 @@ $(srcdir)/main/options_init_free.c
$(srcdir)/main/options_types.h $(srcdir)/main
MAINTAINERCLEANFILES += main/options_init_free.c main/options_types.h \
main/options_get_perl.c
+########################## 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
@@ -328,29 +352,6 @@ libtexinfo_convert_la_LIBADD = libtexinfo.la
libtexinfoxs.la $(top_builddir)/gnu
libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS)
$(LTLIBINTL) $(LTLIBICONV) $(LTLIBUNISTRING)
#libtexinfo_convert_la_LDFLAGS = -version-info 0:0:0 -Wl,--no-undefined
$(perl_conf_LDFLAGS) $(perl_conf_PERL_LINK) $(LTLIBINTL) $(LTLIBICONV)
$(LTLIBUNISTRING)
-########################## 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)
-
########################## Parsetexi XS parser
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/Makefile.am: change order of xs_LTLIBRARIES for relinking in make distcheck.,
Patrice Dumas <=