branch release/7.1 updated: Do not distribute xsubpp-generated files

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch release/7.1
in repository texinfo.

The following commit(s) were added to refs/heads/release/7.1 by this push:
     new 362d50053e Do not distribute xsubpp-generated files
362d50053e is described below

commit 362d50053e81aef079213e76be833f18a54b0e80
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Dec 17 18:28:46 2023 +0000

    Do not distribute xsubpp-generated files
    
    * tp/Texinfo/XS/Makefile.am (TestXS_la_SOURCES, MiscXS_la_SOURCES)
    (XSParagraph_la_SOURCES, Parsetexi_la_SOURCES):
    Do not distribute *.c files generated from *.xs files by
    xsubpp.  List these files in the corresponding nodist_* variable.
    (CLEANFILES): Add these *.c files.
    (.xs.c): Generate in builddir not srcdir.
    
    This avoids the possibility of one of the distributed
    files being overwritten with no way to get back the original
    contents, while users expect "make distclean" to restore the
    original state of a distribution.
    
    Report from Hilmar Preuße <hille42@web.de>.
---
 ChangeLog                 | 18 ++++++++++++++++++
 tp/Texinfo/XS/Makefile.am | 20 ++++++++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2145debc22..92e2c5afe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2023-12-17  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Do not distribute xsubpp-generated files
+
+       * tp/Texinfo/XS/Makefile.am (TestXS_la_SOURCES, MiscXS_la_SOURCES)
+       (XSParagraph_la_SOURCES, Parsetexi_la_SOURCES):
+       Do not distribute *.c files generated from *.xs files by
+       xsubpp.  List these files in the corresponding nodist_* variable.
+       (CLEANFILES): Add these *.c files.
+       (.xs.c): Generate in builddir not srcdir.
+
+       This avoids the possibility of one of the distributed
+       files being overwritten with no way to get back the original
+       contents, while users expect "make distclean" to restore the
+       original state of a distribution.
+
+       Report from Hilmar Preuße <hille42@web.de>.
+
 2023-11-15  Gavin Smith <gavinsmith0123@gmail.com>
 
        Further obstack alignment fix for sparc64
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index fadc42d816..ea42733956 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -38,7 +38,7 @@ PERL_INC = $(PERL_CONF_archlibexp)/CORE
 XSUBPPARGS = -typemap $(PERL_CONF_privlibexp)/ExtUtils/typemap
 
 .xs.c:
-       $(XSUBPP) $(XSUBPPARGS) $< > $*.xsc && mv $*.xsc $(srcdir)/$*.c
+       $(XSUBPP) $(XSUBPPARGS) $< > $*.xsc && mv $*.xsc $*.c
 
 EXTRA_DIST += TestXS.pm
 
@@ -47,12 +47,18 @@ EXTRA_DIST += TestXS.pm
 CLEANFILES =
 
 xs_LTLIBRARIES = XSParagraph.la TestXS.la
-XSParagraph_la_SOURCES = XSParagraph.c xspara.c xspara.h \
+nodist_XSParagraph_la_SOURCES = XSParagraph.c
+CLEANFILES += XSParagraph.c
+XSParagraph_la_SOURCES = xspara.c xspara.h \
                         text.c text.h ppport.h
-TestXS_la_SOURCES = TestXS.c ppport.h
+nodist_TestXS_la_SOURCES = TestXS.c
+CLEANFILES += TestXS.c
+TestXS_la_SOURCES = ppport.h
 
 xs_LTLIBRARIES += MiscXS.la
-MiscXS_la_SOURCES = MiscXS.c misc.c miscxs.h ppport.h
+nodist_MiscXS_la_SOURCES = MiscXS.c
+CLEANFILES += MiscXS.c
+MiscXS_la_SOURCES = misc.c miscxs.h ppport.h
 MiscXS_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la
 
 
@@ -97,8 +103,10 @@ if HAVE_ICONV
 xs_LTLIBRARIES += Parsetexi.la
 endif
 
-Parsetexi_la_SOURCES= parsetexi/Parsetexi.c \
-                      parsetexi/api.c \
+nodist_Parsetexi_la_SOURCES= parsetexi/Parsetexi.c
+CLEANFILES += parsetexi/Parsetexi.c
+
+Parsetexi_la_SOURCES= parsetexi/api.c \
                      parsetexi/api.h \
                      parsetexi/parser.c \
                      parsetexi/parser.h \