From 4909a2add1ba6398bbeaa536e502e0ad2abce0b5 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sat, 29 Jul 2023 07:17:29 -0300 Subject: build: sort clean commands --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5b9335127..7bca3c10f 100644 --- a/Makefile +++ b/Makefile @@ -173,20 +173,20 @@ clean: $(MAKE) -C src/man clean $(MAKE) -C test clean rm -f $(SECCOMP_FILTERS) - rm -f firejail*.rpm rm -f $(SYNTAX_FILES) + rm -f firejail*.rpm rm -f src/fnettrace/static-ip-map - rm -f test/utils/index.html* - rm -f test/utils/wget-log - rm -f test/utils/firejail-test-file* - rm -f test/utils/lstesting - rm -f test/environment/index.html* - rm -f test/environment/wget-log* rm -fr test/environment/-testdir - rm -f test/environment/logfile* rm -f test/environment/index.html + rm -f test/environment/index.html* + rm -f test/environment/logfile* rm -f test/environment/wget-log + rm -f test/environment/wget-log* rm -f test/sysutils/firejail_t* + rm -f test/utils/firejail-test-file* + rm -f test/utils/index.html* + rm -f test/utils/lstesting + rm -f test/utils/wget-log cd test/compile; ./compile.sh --clean; cd ../.. .PHONY: distclean -- cgit v1.2.3-54-g00ecf From 3675da93ae7e4eb9018332893e6380cbeb011a21 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Thu, 14 Dec 2023 22:09:03 -0300 Subject: build: remove redundant clean commands --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7bca3c10f..e85c8752c 100644 --- a/Makefile +++ b/Makefile @@ -177,10 +177,8 @@ clean: rm -f firejail*.rpm rm -f src/fnettrace/static-ip-map rm -fr test/environment/-testdir - rm -f test/environment/index.html rm -f test/environment/index.html* rm -f test/environment/logfile* - rm -f test/environment/wget-log rm -f test/environment/wget-log* rm -f test/sysutils/firejail_t* rm -f test/utils/firejail-test-file* -- cgit v1.2.3-54-g00ecf From 152a21f151c752721a9427012e19291384516481 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sat, 29 Jul 2023 07:19:25 -0300 Subject: build: simplify clean target Move some clean commands into more relevant makefiles. --- Makefile | 11 ----------- src/fnettrace/Makefile | 2 ++ test/Makefile | 10 ++++++++++ 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e85c8752c..c061e0c7a 100644 --- a/Makefile +++ b/Makefile @@ -175,17 +175,6 @@ clean: rm -f $(SECCOMP_FILTERS) rm -f $(SYNTAX_FILES) rm -f firejail*.rpm - rm -f src/fnettrace/static-ip-map - rm -fr test/environment/-testdir - rm -f test/environment/index.html* - rm -f test/environment/logfile* - rm -f test/environment/wget-log* - rm -f test/sysutils/firejail_t* - rm -f test/utils/firejail-test-file* - rm -f test/utils/index.html* - rm -f test/utils/lstesting - rm -f test/utils/wget-log - cd test/compile; ./compile.sh --clean; cd ../.. .PHONY: distclean distclean: clean diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile index 2ad296d1d..93ce9334d 100644 --- a/src/fnettrace/Makefile +++ b/src/fnettrace/Makefile @@ -7,6 +7,8 @@ MOD_DIR = $(ROOT)/src/$(MOD) PROG = $(MOD_DIR)/$(MOD) TARGET = $(PROG) +CLEANFILES += static-ip-map + include $(ROOT)/src/prog.mk all: $(TARGET) static-ip-map diff --git a/test/Makefile b/test/Makefile index d7b1bac7a..2ac6e4c6f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -12,3 +12,13 @@ $(TESTS): .PHONY: clean clean: for test in $(TESTS); do rm -f "$$test/$$test.log"; done + rm -fr environment/-testdir + rm -f environment/index.html* + rm -f environment/logfile* + rm -f environment/wget-log* + rm -f sysutils/firejail_t* + rm -f utils/firejail-test-file* + rm -f utils/index.html* + rm -f utils/lstesting + rm -f utils/wget-log + cd compile && ./compile.sh --clean -- cgit v1.2.3-54-g00ecf From 8a783cdc2f55f2fb2020c2b7c634e1d27b304757 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sat, 29 Jul 2023 07:18:13 -0300 Subject: build: use TARNAME and remove more paths on clean --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c061e0c7a..1d92ec7ac 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,9 @@ clean: $(MAKE) -C test clean rm -f $(SECCOMP_FILTERS) rm -f $(SYNTAX_FILES) - rm -f firejail*.rpm + rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz + rm -f $(TARNAME)*.deb + rm -f $(TARNAME)*.rpm .PHONY: distclean distclean: clean @@ -326,7 +328,6 @@ DISTFILES_TEST = \ .PHONY: dist dist: clean config.mk - rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz mkdir -p $(TARNAME)-$(VERSION)/test cp -a $(DISTFILES) $(TARNAME)-$(VERSION) cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test -- cgit v1.2.3-54-g00ecf