summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-16 00:33:30 -0500
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-16 00:33:30 -0500
commit5afa997dae3a3cbe73e01c7a2901fc6ba596e070 (patch)
tree3c904e1114572110a5b0869c8827ca1afb3e234d /scripts
parent5a7728c6d3eb83df9d120944cca4cf476dd326a1 (diff)
parentfa2035a6c48bde0fe3c009764d74716a822910aa (diff)
Merge tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5
into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.make
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile9
-rw-r--r--scripts/lxdialog/Makefile3
2 files changed, 4 insertions, 8 deletions
diff --git a/scripts/Makefile b/scripts/Makefile
index 0921e79c6c79..6032efe0f0aa 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -11,6 +11,8 @@
EXTRA_TARGETS := fixdep split-include docproc conmakehash
+subdir- := lxdialog
+
# Yikes. We need to build this stuff here even if the user only wants
# modules.
@@ -24,6 +26,8 @@ KBUILD_BUILTIN := 1
host-progs := fixdep split-include conmakehash docproc tkparse
tkparse-objs := tkparse.o tkcond.o tkgen.o
+clean-files := kconfig.tk
+
include $(TOPDIR)/Rules.make
# In reality kconfig.tk should depend on all Config.in files,
@@ -56,8 +60,3 @@ lxdialog:
# fixdep is needed to compile other host programs
$(obj)/split-include $(obj)/docproc $(addprefix $(obj)/,$(tkparse-objs)) \
$(obj)/conmakehash lxdialog: $(obj)/fixdep
-
-mrproper:
- @rm -f $(host-progs) $(addprefix $(obj)/,$(tkparse-objs) kconfig.tk core)
- @$(call descend,scripts/lxdialog,mrproper)
-
diff --git a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile
index da5e5a1ab32d..252c5bf86cd1 100644
--- a/scripts/lxdialog/Makefile
+++ b/scripts/lxdialog/Makefile
@@ -42,6 +42,3 @@ ncurses:
echo ;\
exit 1 ;\
fi
-
-mrproper:
- @rm -f $(host-progs) $(addprefix $(obj)/,$(lxdialog-objs))