[nongnu] elpa/vm d76fcc9048 2/2: Merge branch 'main' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit d76fcc90488ef77d4ea7fb2a34d7de50110e25c9
Merge: f0e450f2cf f1ffa159f8
Author: Mark Diekhans <markd@ucsc.edu>
Commit: Mark Diekhans <markd@ucsc.edu>

    Merge branch 'main' into 'main'
    
    update clean targets to remove generates files that were not cleaned
    
    See merge request emacs-vm/vm!23
---
 .gitignore       | 2 --
 Makefile.in      | 2 ++
 lisp/Makefile.in | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0cc1e0bcbb..a82fb359c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,8 +37,6 @@ config.status
 configure
 release
 snapshot
-CVS
-.cvsignore
 info/version.texinfo
 lisp/version.txt
 /lisp/vm-autoloads.el
diff --git a/Makefile.in b/Makefile.in
index 222327e9a7..ef88c8ac66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,6 +60,8 @@ clean:
 
 distclean:
        @for i in $(SUBDIRS) ; do ($(MAKE) -C $$i distclean) || exit 1; done
+       -$(RM) -f Makefile vm-load.el configure config.status config.log
+       -$(RM) -rf autom4te.cache
 
 push:
        $(BZR) push
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index a89f473d61..1a9428cc51 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -251,4 +251,4 @@ clean:
        -$(RM) -f version.txt *.elc vm-autoloads.el auto-autoloads.el 
custom-load.el
 
 distclean: clean
-       -$(RM) -f Makefile
+       -$(RM) -f Makefile vm-cus-load.el