doc/Makefile: add stamp_error_codes to EXTRA_DIST

This also moves stamp_* to MAINTAINERCLEANFILES from DISTCLEANFILES,
which should not include what's in the tarball.

Fixes: #1797
Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>
Modified-by: Daiki Ueno <ueno@gnu.org>

diff --git a/.gitignore b/.gitignore
index 774bf7606866171b5722c3e7833e412df12f170c..481088bf7f7bf1a0fc7304b27b1751f291795655 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -177,6 +177,7 @@ doc/scripts/Makefile
 doc/scripts/Makefile.in
 doc/socket-api.texi
 doc/stamp_enums
+doc/stamp_error_codes
 doc/stamp_functions
 doc/stamp_invoke
 doc/stamp-vti

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3edcb2d1919ee374aaded34f96f9353b937db585..b7fbe6d88391e533810eef7048e74ad15a8ed91c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,7 @@
 
 EXTRA_DIST = TODO certtool.cfg gnutls.html     \
        doxygen/Doxyfile.in doxygen/Doxyfile.orig texinfo.css \
-       stamp_enums stamp_functions \
+       stamp_enums stamp_functions stamp_error_codes \
        doc.mk
 
 IMAGES = \
@@ -236,6 +236,7 @@ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
        --no-split --css-include=$(srcdir)/texinfo.css
 
 MAINTAINERCLEANFILES =
+DISTCLEANFILES =
 
 # Generated texinfos.
 
@@ -244,7 +245,7 @@ API_FILES=gnutls-api.texi socket-api.texi x509-api.texi pkcs12-api.texi \
        dtls-api.texi crypto-api.texi ocsp-api.texi tpm-api.texi dane-api.texi \
        pkcs7-api.texi hpke-api.texi
 
-MAINTAINERCLEANFILES += stamp_enums stamp_functions functions enums
+MAINTAINERCLEANFILES += stamp_enums stamp_functions stamp_error_codes
 
 gnutls_TEXINFOS += $(API_FILES)
 
@@ -416,13 +417,14 @@ if !WINDOWS
 gnutls_TEXINFOS += error_codes.texi algorithms.texi alerts.texi enums.texi
 endif
 
-DISTCLEANFILES = error_codes.texi algorithms.texi alerts.texi enums.texi
+MAINTAINERCLEANFILES += error_codes.texi algorithms.texi alerts.texi enums.texi
 
 AM_CPPFLAGS = \
        -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \
        -I$(top_builddir)/
 
 EXTRA_PROGRAMS = errcodes printlist alert-printlist
+DISTCLEANFILES += $(EXTRA_PROGRAMS)
 
 errcodes_SOURCES = errcodes.c common.c common.h
 errcodes_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
@@ -468,8 +470,7 @@ enums.texi: $(HEADER_FILES)
        mv -f $@-tmp $@
 
 gnutls_TEXINFOS += $(ENUMS) $(FUNCS) $(AUTOGENED_DOC)
-DISTCLEANFILES += $(ENUMS) stamp_enums stamp_error_codes stamp_functions \
-  errcodes printlist alert-printlist
+MAINTAINERCLEANFILES += $(ENUMS) $(FUNCS) $(AUTOGENED_DOC)
 
 
 stamp_functions: $(API_FILES)