branch master updated: Avoid cleaning generated files

[Gavin D. Smith]

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

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 330daef  Avoid cleaning generated files
330daef is described below

commit 330daef4430a7c2dba6b68e7c4bcebdc0d053f15
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Feb 27 22:01:56 2021 +0000

    Avoid cleaning generated files
    
    * tp/Texinfo/XS/Makefile.am (CLEANFILES): Remove .c files that
    are generated from .xs files, as these .c files are distributed
    in the tarball and shouldn't be cleaned.
    (.xs.c): Generate .c files under $(srcdir).
    
    Report from Bruno Haible.
---
 ChangeLog                 | 11 +++++++++++
 tp/Texinfo/XS/Makefile.am | 11 ++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c365b60..fed6598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2021-02-27  Gavin Smith  <gavinsmith0123@gmail.com>
 
+       Avoid cleaning generated files
+
+       * tp/Texinfo/XS/Makefile.am (CLEANFILES): Remove .c files that
+       are generated from .xs files, as these .c files are distributed
+       in the tarball and shouldn't be cleaned.
+       (.xs.c): Generate .c files under $(srcdir).
+
+       Report from Bruno Haible.
+
+2021-02-27  Gavin Smith  <gavinsmith0123@gmail.com>
+
        * tp/Texinfo/Report.pm (gdt): Set and restore LC_ALL rather than
        LC_MESSAGES as the latter doesn't work on MS-Windows.  Report
        from Eli Zaretskii.
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 3539766..999fda1 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 $*.c
+       $(XSUBPP) $(XSUBPPARGS) $< > $*.xsc && mv $*.xsc $(srcdir)/$*.c
 
 EXTRA_DIST += TestXS.pm
 
@@ -61,14 +61,7 @@ MiscXS_la_SOURCES = MiscXS.c misc.c miscxs.h ppport.h
 install-data-hook:
        rm -f $(DESTDIR)$(xsdir)/TestXS*
 
-CLEANFILES += TestXS.c
-EXTRA_DIST += TestXS.xs
-
-CLEANFILES += XSParagraph.c
-EXTRA_DIST += XSParagraph.xs
-
-CLEANFILES += MiscXS.c
-EXTRA_DIST += MiscXS.xs
+EXTRA_DIST += TestXS.xs XSParagraph.xs MiscXS.xs
 
 
 AM_CFLAGS = $(PERL_CONF_ccflags) $(PERL_CONF_optimize)