diff options
author | 2024-02-04 23:25:23 +0000 | |
---|---|---|
committer | 2024-02-04 23:25:23 +0000 | |
commit | 71ffe7ac8f0bd1d571a7a069207ead964394f413 (patch) | |
tree | 24efa31d8e053cbb62d29a633b09d0aeeeba0df6 | |
parent | security: fix sscanf rv checks (CodeQL) (#6184) (diff) | |
parent | build: use *.tar.xz on .gitignore (diff) | |
download | firejail-71ffe7ac8f0bd1d571a7a069207ead964394f413.tar.gz firejail-71ffe7ac8f0bd1d571a7a069207ead964394f413.tar.zst firejail-71ffe7ac8f0bd1d571a7a069207ead964394f413.zip |
Merge pull request #6186 from kmk3/build-improve-clean
build: improve main clean target
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile | 18 | ||||
-rw-r--r-- | src/fnettrace/Makefile | 2 | ||||
-rw-r--r-- | test/Makefile | 10 |
4 files changed, 16 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore index 3413abd55..5e126990f 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -5,6 +5,7 @@ | |||
5 | *.swp | 5 | *.swp |
6 | *.deb | 6 | *.deb |
7 | *.rpm | 7 | *.rpm |
8 | *.tar.xz | ||
8 | *.gcda | 9 | *.gcda |
9 | *.gcno | 10 | *.gcno |
10 | *.gz | 11 | *.gz |
@@ -20,7 +21,6 @@ config.status | |||
20 | contrib/syntax/files/example | 21 | contrib/syntax/files/example |
21 | contrib/syntax/files/firejail-profile.lang | 22 | contrib/syntax/files/firejail-profile.lang |
22 | contrib/syntax/files/firejail.vim | 23 | contrib/syntax/files/firejail.vim |
23 | firejail-*.tar.xz | ||
24 | src/fnettrace-dns/fnettrace-dns | 24 | src/fnettrace-dns/fnettrace-dns |
25 | src/fnettrace-sni/fnettrace-sni | 25 | src/fnettrace-sni/fnettrace-sni |
26 | src/fnettrace-icmp/fnettrace-icmp | 26 | src/fnettrace-icmp/fnettrace-icmp |
@@ -173,21 +173,10 @@ clean: | |||
173 | $(MAKE) -C src/man clean | 173 | $(MAKE) -C src/man clean |
174 | $(MAKE) -C test clean | 174 | $(MAKE) -C test clean |
175 | rm -f $(SECCOMP_FILTERS) | 175 | rm -f $(SECCOMP_FILTERS) |
176 | rm -f firejail*.rpm | ||
177 | rm -f $(SYNTAX_FILES) | 176 | rm -f $(SYNTAX_FILES) |
178 | rm -f src/fnettrace/static-ip-map | 177 | rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz |
179 | rm -f test/utils/index.html* | 178 | rm -f $(TARNAME)*.deb |
180 | rm -f test/utils/wget-log | 179 | rm -f $(TARNAME)*.rpm |
181 | rm -f test/utils/firejail-test-file* | ||
182 | rm -f test/utils/lstesting | ||
183 | rm -f test/environment/index.html* | ||
184 | rm -f test/environment/wget-log* | ||
185 | rm -fr test/environment/-testdir | ||
186 | rm -f test/environment/logfile* | ||
187 | rm -f test/environment/index.html | ||
188 | rm -f test/environment/wget-log | ||
189 | rm -f test/sysutils/firejail_t* | ||
190 | cd test/compile; ./compile.sh --clean; cd ../.. | ||
191 | 180 | ||
192 | .PHONY: distclean | 181 | .PHONY: distclean |
193 | distclean: clean | 182 | distclean: clean |
@@ -339,7 +328,6 @@ DISTFILES_TEST = \ | |||
339 | 328 | ||
340 | .PHONY: dist | 329 | .PHONY: dist |
341 | dist: clean config.mk | 330 | dist: clean config.mk |
342 | rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz | ||
343 | mkdir -p $(TARNAME)-$(VERSION)/test | 331 | mkdir -p $(TARNAME)-$(VERSION)/test |
344 | cp -a $(DISTFILES) $(TARNAME)-$(VERSION) | 332 | cp -a $(DISTFILES) $(TARNAME)-$(VERSION) |
345 | cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test | 333 | cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test |
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 | ||