diff options
author | 2023-07-29 07:19:25 -0300 | |
---|---|---|
committer | 2024-01-31 17:37:05 -0300 | |
commit | 152a21f151c752721a9427012e19291384516481 (patch) | |
tree | ffe487d05e901c1159112f71ba1ca99d7273f89a | |
parent | build: remove redundant clean commands (diff) | |
download | firejail-152a21f151c752721a9427012e19291384516481.tar.gz firejail-152a21f151c752721a9427012e19291384516481.tar.zst firejail-152a21f151c752721a9427012e19291384516481.zip |
build: simplify clean target
Move some clean commands into more relevant makefiles.
-rw-r--r-- | Makefile | 11 | ||||
-rw-r--r-- | src/fnettrace/Makefile | 2 | ||||
-rw-r--r-- | test/Makefile | 10 |
3 files changed, 12 insertions, 11 deletions
@@ -175,17 +175,6 @@ clean: | |||
175 | rm -f $(SECCOMP_FILTERS) | 175 | rm -f $(SECCOMP_FILTERS) |
176 | rm -f $(SYNTAX_FILES) | 176 | rm -f $(SYNTAX_FILES) |
177 | rm -f firejail*.rpm | 177 | rm -f firejail*.rpm |
178 | rm -f src/fnettrace/static-ip-map | ||
179 | rm -fr test/environment/-testdir | ||
180 | rm -f test/environment/index.html* | ||
181 | rm -f test/environment/logfile* | ||
182 | rm -f test/environment/wget-log* | ||
183 | rm -f test/sysutils/firejail_t* | ||
184 | rm -f test/utils/firejail-test-file* | ||
185 | rm -f test/utils/index.html* | ||
186 | rm -f test/utils/lstesting | ||
187 | rm -f test/utils/wget-log | ||
188 | cd test/compile; ./compile.sh --clean; cd ../.. | ||
189 | 178 | ||
190 | .PHONY: distclean | 179 | .PHONY: distclean |
191 | distclean: clean | 180 | 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) | |||
7 | PROG = $(MOD_DIR)/$(MOD) | 7 | PROG = $(MOD_DIR)/$(MOD) |
8 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
9 | 9 | ||
10 | CLEANFILES += static-ip-map | ||
11 | |||
10 | include $(ROOT)/src/prog.mk | 12 | include $(ROOT)/src/prog.mk |
11 | 13 | ||
12 | all: $(TARGET) static-ip-map | 14 | 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): | |||
12 | .PHONY: clean | 12 | .PHONY: clean |
13 | clean: | 13 | clean: |
14 | for test in $(TESTS); do rm -f "$$test/$$test.log"; done | 14 | for test in $(TESTS); do rm -f "$$test/$$test.log"; done |
15 | rm -fr environment/-testdir | ||
16 | rm -f environment/index.html* | ||
17 | rm -f environment/logfile* | ||
18 | rm -f environment/wget-log* | ||
19 | rm -f sysutils/firejail_t* | ||
20 | rm -f utils/firejail-test-file* | ||
21 | rm -f utils/index.html* | ||
22 | rm -f utils/lstesting | ||
23 | rm -f utils/wget-log | ||
24 | cd compile && ./compile.sh --clean | ||