kconfig: move lxdialog to scripts/kconfig/lxdialog

The only lxdialog user i kconfig - for menuconfig.
So move it to reflect this.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/scripts/Makefile b/scripts/Makefile
index 67763ee..6f6b48f 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -19,4 +19,4 @@ subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-$(CONFIG_MODULES)     += mod
 
 # Let clean descend into subdirs
-subdir-        += basic lxdialog kconfig package
+subdir-        += basic kconfig package

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 9d67782..55bf955 100644 (file)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,7 +11,7 @@ gconfig: $(obj)/gconf
        $< arch/$(ARCH)/Kconfig
 
 menuconfig: $(obj)/mconf
-       $(Q)$(MAKE) $(build)=scripts/lxdialog
+       $(Q)$(MAKE) $(build)=scripts/kconfig/lxdialog
        $< arch/$(ARCH)/Kconfig
 
 config: $(obj)/conf
@@ -115,6 +115,7 @@ endif
 
 clean-files    := lkc_defs.h qconf.moc .tmp_qtcheck \
                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
+subdir- += lxdialog
 
 # Needed for systems without gettext
 KBUILD_HAVE_NLS := $(shell \

diff --git a/scripts/lxdialog/BIG.FAT.WARNING b/scripts/kconfig/lxdialog/BIG.FAT.WARNING
similarity index 100%
rename from scripts/lxdialog/BIG.FAT.WARNING
rename to scripts/kconfig/lxdialog/BIG.FAT.WARNING

diff --git a/scripts/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
similarity index 100%
rename from scripts/lxdialog/Makefile
rename to scripts/kconfig/lxdialog/Makefile

diff --cc scripts/kconfig/lxdialog/checklist.c
Simple merge

diff --cc scripts/kconfig/lxdialog/colors.h
Simple merge

diff --cc scripts/kconfig/lxdialog/dialog.h
Simple merge

diff --cc scripts/kconfig/lxdialog/inputbox.c
Simple merge

diff --cc scripts/kconfig/lxdialog/lxdialog.c
Simple merge

diff --cc scripts/kconfig/lxdialog/menubox.c
Simple merge

diff --cc scripts/kconfig/lxdialog/msgbox.c
Simple merge

diff --cc scripts/kconfig/lxdialog/textbox.c
Simple merge

diff --cc scripts/kconfig/lxdialog/util.c
Simple merge

diff --cc scripts/kconfig/lxdialog/yesno.c
Simple merge

diff --cc scripts/kconfig/mconf.c
Simple merge