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>

15 files changed, 5 insertions, 4 deletions

diff --git a/scripts/Makefile b/scripts/Makefile
index 67763eeb8a3e..6f6b48f39f0a 100644
--- 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 9d67782b812f..55bf95531f2f 100644
--- 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
index a8999d82bdb3..a8999d82bdb3 100644
--- a/scripts/lxdialog/BIG.FAT.WARNING
+++ b/scripts/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/scripts/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
index a45a13fb26ed..a45a13fb26ed 100644
--- a/scripts/lxdialog/Makefile
+++ b/scripts/kconfig/lxdialog/Makefile
diff --git a/scripts/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 3fb681fb9632..3fb681fb9632 100644
--- a/scripts/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
diff --git a/scripts/lxdialog/colors.h b/scripts/kconfig/lxdialog/colors.h
index db071df12bbb..db071df12bbb 100644
--- a/scripts/lxdialog/colors.h
+++ b/scripts/kconfig/lxdialog/colors.h
diff --git a/scripts/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index f882204cb3c2..f882204cb3c2 100644
--- a/scripts/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
diff --git a/scripts/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index 779503726b0a..779503726b0a 100644
--- a/scripts/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
diff --git a/scripts/lxdialog/lxdialog.c b/scripts/kconfig/lxdialog/lxdialog.c
index 2c34ea1e0a41..2c34ea1e0a41 100644
--- a/scripts/lxdialog/lxdialog.c
+++ b/scripts/kconfig/lxdialog/lxdialog.c
diff --git a/scripts/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 2d91880825ed..09512b544375 100644
--- a/scripts/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -58,7 +58,7 @@
 
 #include "dialog.h"
 
-#define ITEM_IDENT 4   /* Indent of menu entries. Fixed for all menus */
+#define ITEM_IDENT 1   /* Indent of menu entries. Fixed for all menus */
 static int menu_width;
 
 /*
diff --git a/scripts/lxdialog/msgbox.c b/scripts/kconfig/lxdialog/msgbox.c
index 7323f5471f69..7323f5471f69 100644
--- a/scripts/lxdialog/msgbox.c
+++ b/scripts/kconfig/lxdialog/msgbox.c
diff --git a/scripts/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 77848bb8e07f..77848bb8e07f 100644
--- a/scripts/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
diff --git a/scripts/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index f82cebb9ff06..f82cebb9ff06 100644
--- a/scripts/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
diff --git a/scripts/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
index cb2568aae3ed..cb2568aae3ed 100644
--- a/scripts/lxdialog/yesno.c
+++ b/scripts/kconfig/lxdialog/yesno.c
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d1ad40531ee5..d63d7fb677e4 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -325,7 +325,7 @@ static void cprint_init(void)
         memset(args, 0, sizeof(args));
         indent = 0;
         child_count = 0;
-        cprint("./scripts/lxdialog/lxdialog");
+        cprint("./scripts/kconfig/lxdialog/lxdialog");
         cprint("--backtitle");
         cprint(menu_backtitle);
 }