aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-07-15 01:41:25 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-07-20 05:03:47 -0300
commit5f2785290620a17c3f41f19df91ba86f28eabf16 (patch)
tree283ee28d2f9904465840679777266ca895395844
parentbuild: fix hardcoded make in recursive make calls (diff)
downloadfirejail-5f2785290.tar.gz
firejail-5f2785290.tar.zst
firejail-5f2785290.zip
build: remove unnecessary distclean targets
This also fixes the duplicate execution of the "clean" targets.
-rw-r--r--Makefile4
-rw-r--r--src/bash_completion/Makefile3
-rw-r--r--src/prog.mk3
-rw-r--r--src/so.mk3
-rw-r--r--src/zsh_completion/Makefile3
-rw-r--r--test/Makefile3
6 files changed, 0 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 039dd6946..93fcb4e9a 100644
--- a/Makefile
+++ b/Makefile
@@ -184,10 +184,6 @@ clean:
184 184
185.PHONY: distclean 185.PHONY: distclean
186distclean: clean 186distclean: clean
187 for dir in $$(dirname $(ALL_ITEMS)) $(MYDIRS); do \
188 $(MAKE) -C $$dir distclean; \
189 done
190 $(MAKE) -C test distclean
191 rm -fr autom4te.cache config.log config.mk config.sh config.status 187 rm -fr autom4te.cache config.log config.mk config.sh config.status
192 188
193.PHONY: realinstall 189.PHONY: realinstall
diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile
index 516805886..1df030da3 100644
--- a/src/bash_completion/Makefile
+++ b/src/bash_completion/Makefile
@@ -13,6 +13,3 @@ firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk
13.PHONY: clean 13.PHONY: clean
14clean: 14clean:
15 rm -fr firejail.bash_completion 15 rm -fr firejail.bash_completion
16
17.PHONY: distclean
18distclean: clean
diff --git a/src/prog.mk b/src/prog.mk
index 70b3629b2..b7ac59785 100644
--- a/src/prog.mk
+++ b/src/prog.mk
@@ -20,6 +20,3 @@ $(PROG): $(OBJS) $(ROOT)/config.mk
20 20
21.PHONY: clean 21.PHONY: clean
22clean:; rm -fr $(PROG) $(CLEANFILES) 22clean:; rm -fr $(PROG) $(CLEANFILES)
23
24.PHONY: distclean
25distclean: clean
diff --git a/src/so.mk b/src/so.mk
index dadffc52f..c1913b794 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -20,6 +20,3 @@ $(SO): $(OBJS) $(ROOT)/config.mk
20 20
21.PHONY: clean 21.PHONY: clean
22clean:; rm -fr $(SO) $(CLEANFILES) 22clean:; rm -fr $(SO) $(CLEANFILES)
23
24.PHONY: distclean
25distclean: clean
diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile
index cc811ae99..bf83877fb 100644
--- a/src/zsh_completion/Makefile
+++ b/src/zsh_completion/Makefile
@@ -13,6 +13,3 @@ _firejail: _firejail.in $(ROOT)/config.mk
13.PHONY: clean 13.PHONY: clean
14clean: 14clean:
15 rm -fr _firejail 15 rm -fr _firejail
16
17.PHONY: distclean
18distclean: clean
diff --git a/test/Makefile b/test/Makefile
index 08462c09b..d7b1bac7a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,6 +12,3 @@ $(TESTS):
12.PHONY: clean 12.PHONY: clean
13clean: 13clean:
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
16.PHONY: distclean
17distclean: clean