summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-03 03:20:27 -0500
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-03 03:20:27 -0500
commitb10f06117d1a8c5accdf74c83ad09bebd89fbf6b (patch)
tree97743cc9d957a1404e64840f4059c080c19da17e
parent09384ba9a2c6c66c9b36171a33e6d221319003c6 (diff)
kbuild: Adapt mrproper targets
Use $(call descend,..) for mrproper as well.
-rw-r--r--Documentation/DocBook/Makefile2
-rw-r--r--Makefile6
-rw-r--r--scripts/Makefile6
-rw-r--r--scripts/lxdialog/Makefile2
4 files changed, 6 insertions, 10 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index a552c2936957..79b9dd0c72e6 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -154,7 +154,6 @@ LOG := $(patsubst %.sgml, %.log, $(BOOKS))
OUT := $(patsubst %.sgml, %.out, $(BOOKS))
clean:
- @echo 'Cleaning up (DocBook)'
@rm -f core *~
@rm -f $(BOOKS)
@rm -f $(DVI) $(AUX) $(TEX) $(LOG) $(OUT)
@@ -162,7 +161,6 @@ clean:
@rm -f $(C-procfs-example)
mrproper:
- @echo 'Making mrproper (DocBook)'
@rm -f $(PS) $(PDF)
@rm -f -r $(HTML) $(patsubst %.html,%,$(HTML))
diff --git a/Makefile b/Makefile
index ae7e5926b212..ad7ed90bc6f7 100644
--- a/Makefile
+++ b/Makefile
@@ -712,7 +712,7 @@ clean: archclean
-name .\*.tmp -o -name .\*.d \) -type f -print \
| grep -v lxdialog/ | xargs rm -f
@rm -f $(CLEAN_FILES)
- @$(MAKE) -f Documentation/DocBook/Makefile clean
+ @$(call descend,Documentation/DocBook,clean)
mrproper: clean archmrproper
@echo 'Making mrproper'
@@ -722,7 +722,7 @@ mrproper: clean archmrproper
@rm -rf $(MRPROPER_DIRS)
@rm -f $(MRPROPER_FILES)
@$(call descend,scripts,mrproper)
- @$(MAKE) -f Documentation/DocBook/Makefile mrproper
+ @$(call descend,Documentation/DocBook,mrproper)
distclean: mrproper
@echo 'Making distclean'
@@ -809,7 +809,7 @@ help:
# Documentation targets
# ---------------------------------------------------------------------------
sgmldocs psdocs pdfdocs htmldocs: scripts
- @$(MAKE) -f Documentation/DocBook/Makefile $@
+ @$(call descend,Documentation/DocBook,$@)
# Scripts to check various things for consistency
# ---------------------------------------------------------------------------
diff --git a/scripts/Makefile b/scripts/Makefile
index 07a974b50864..8a0a85ea9a61 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -58,8 +58,6 @@ $(obj)/split-include $(obj)/docproc $(addprefix $(obj)/,$(tkparse-objs)) \
$(obj)/conmakehash lxdialog: $(obj)/fixdep
mrproper:
- @echo 'Making mrproper (scripts)'
- @rm -f $(tkparse-objs) $(obj)/kconfig.tk
- @rm -f core $(host-progs)
- @$(MAKE) -C lxdialog mrproper
+ @rm -f $(addprefix $(obj)/,$(tkparse-objs) $(obj)/kconfig.tk core $(host-progs))
+ @$(call descend,scripts/lxdialog,mrproper)
diff --git a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile
index 4d10e93b6be0..c370113b2004 100644
--- a/scripts/lxdialog/Makefile
+++ b/scripts/lxdialog/Makefile
@@ -44,4 +44,4 @@ ncurses:
fi
mrproper:
- @rm -f core $(host-progs) $(lxdialog-objs) ncurses
+ @rm -f $(addprefix $(obj)/,core $(host-progs) $(lxdialog-objs) ncurses)