Re: Additional files to add to clean target

[Janneke Nieuwenhuizen]

Vagrant Cascadian writes:

> There are a handful of files generated during the build that should be
> added to the clean target. One was missed with the addition of the
> riscv64 target and the others have been presumably added over time as
> well.
>
> I have pushed patches in the debian packaging branch, which should be
> able to be applied with "git am" on mes 0.25:

>
>   
> https://salsa.debian.org/debian/mes/-/tree/edb6d296f4c96c0e8509fdb8049453ae20bb3d1c/debian/patches

Thanks!  We were missing some files...but we're also using the GNU build
system clean target definitions: clean (remove build targets), distclean
(remove configure targets), maintainer-clean (remove info targets).

Unless I'm mistaken, maybe you want to use maintainer-clean?

So, I've squashed your patches and rewrote them a bit, see attached.
Does this work for you, or please tell me what I'm missing ;)

Greetings,
Janneke

>From accf01cf709faab29563f5dd970619c02375210b Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Sun, 12 Nov 2023 17:10:25 -0800
Subject: [PATCH] build: Fix clean targets.

* build-aux/GNUmakefile.in (clean): Remove bin/mes-m2, gcc-lib,
mescc-lib, and tcc-lib build directories altogether.
(distclean): Remove pre-inst-env and include/arch.

Co-authored-by: Janneke Nieuwenhuizen <janneke@gnu.org>.
---
 build-aux/GNUmakefile.in | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/build-aux/GNUmakefile.in b/build-aux/GNUmakefile.in
index 7381c8de4..8ddd89ee2 100644
--- a/build-aux/GNUmakefile.in
+++ b/build-aux/GNUmakefile.in
@@ -1,5 +1,6 @@
 # GNU Mes --- Maxwell Equations of Software
 # Copyright © 2018,2019,2021,2022,2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2023 Vagrant Cascadian <vagrant@debian.org>
 #
 # This file is part of GNU Mes.
 #
@@ -106,7 +107,7 @@ arch-dir:
        mkdir -p include/arch
 
 clean:
-       rm -f *.o *.s bin/mes bin/mes-gcc bin/mes-mescc
+       rm -f *.o *.s bin/mes bin/mes-gcc bin/mes-m2 bin/mes-mescc
        rm -f mes.{aux,cp,cps,fn,info,log,tmp,toc,vr,vrs}
        rm -f .log build.log
        rm -f 0exit-42 0hello-mes exit-42 body-exit-42 body-hello-mes hello-mes
@@ -115,26 +116,25 @@ clean:
        rm -f module/mes/*.go module/mescc/*.go
        rm -f module/mescc/armv4/*.go
        rm -f module/mescc/i386/*.go
+       rm -f module/mescc/riscv64/*.go
        rm -f module/mescc/x86_64/*.go
-       rm -rf gcc-lib/*.o gcc-lib/*.s gcc-lib/*.a gcc-lib/*-mes
-       rm -f gcc-lib/libc+gnu.c
-       rm -f gcc-lib/.log gcc-lib/build.log
-       rm -rf mescc-lib/*.o mescc-lib/*.s mescc-lib/*.a mescc-lib/*-mes
-       rm -f mescc-lib/libc+gnu.c
-       rm -f mescc-lib/.log mescc-lib/build.log
-       rm -rf mescc/bin
+       rm -rf gcc-lib/
+       rm -rf mescc-lib/
+       rm -rf tcc-lib/
        rm -f scaffold/boot/*.log scaffold/boot/*.trs
        rm -f test-suite.log tests/*.log tests/*.trs
        rm -f scaffold/*.s scaffold/*.o
        rm -f doc/images/gcc-mesboot-graph.{eps,pdf,png}
        rm -f doc/mes.1 doc/mesar.1 doc/mescc.1
-       rm -f .config .config.E .config.o
 
 distclean: clean
        rm -f GNUmakefile bootstrap.sh build.sh check.sh install.sh uninstall.sh
+       rm -f .config .config.E .config.make .config.o
+       rm -f pre-inst-env
+       rm -rf include/arch/
        rm -f include/mes/config.h
-       rm -f .config.make config.sh mescc-lib/config.sh gcc-lib/config.sh
-       rm -f scripts/mesar scripts/mescc scripts/mescc.scm scripts/m2-merge
+       rm -f .config.make config.sh
+       rm -f scripts/mesar scripts/mescc scripts/mescc.scm
        rm -f TAGS
 
 mostlyclean: clean
-- 
2.41.0

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com