[nasm:nasm-2.16.xx] Makefile: unbreak "make dist"

[nasm-bot for H. Peter Anvin]

Commit-ID:  66a91c37968773404f3863ade2627351a76df0ce
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=66a91c37968773404f3863ade2627351a76df0ce
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Tue, 17 Jan 2023 12:27:10 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Tue, 17 Jan 2023 12:27:10 -0800

Makefile: unbreak "make dist"

Things used by "make dist" haven't been updated for a while, it seems;
in particular have not kept up with the existence of autogen.sh.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 Makefile.in | 17 ++++++++---------
 autogen.sh  |  3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 860d4d26..148fcb50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,22 +380,22 @@ clean:
 	$(RM_F) perlbreq.si
 
 distclean: clean
-	$(RM_F) config.log config.status config/config.h
 	for d in . $(SUBDIRS) $(XSUBDIRS); do \
 		$(RM_F) "$$d"/.\# "$$d"/\# "$$d"/*~ "$$d"/*.bak \
 			"$$d"/*.lst "$$d"/*.bin ; \
 	done
 	$(RM_F) test/*.$(O)
-	$(RM_RF) autom4te*.cache
-	$(RM_F) Makefile *.dep
+	$(RM_F) *.dep
 
 cleaner: clean
 	$(RM_F) $(PERLREQ) *.1 nasm.spec
 	$(MAKE) -C doc clean
 	$(RM_F) *.dep */*.time
 
-spotless: distclean cleaner
-	$(RM_F) doc/Makefile
+makefile-clean:
+	./autogen.sh
+
+spotless: distclean cleaner makefile-clean
 
 strip:
 	$(STRIP) --strip-unneeded $(PROGS)
@@ -431,11 +431,10 @@ everything: always_everything
 install_everything: everything install install_doc
 
 dist:
+	$(MAKE) distclean
 	$(MAKE) alldeps
-	$(MAKE) spotless perlreq manpages spec $(MANPAGES)
-	autoheader
-	autoconf
-	$(RM_RF) ./autom4te*.cache
+	$(MAKE) perlreq manpages spec $(MANPAGES)
+	./autogen.sh
 
 tar: dist
 	tar -cv --exclude CVS -C .. -f - | \
diff --git a/autogen.sh b/autogen.sh
index d1ca83db..f32c0c3f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,7 +47,8 @@ fi
 rm -rf autoconf/*m4.old
 "$AUTOHEADER" -B autoconf
 "$AUTOCONF" -B autoconf
-rm -rf autom4te.cache config.log config.status config/config.h Makefile
+rm -rf autom4te.cache config.log config.status \
+   config/config.h Makefile doc/Makefile
 
 if $recheck; then
     # This bizarre statement has to do with how config.status quotes its output