aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2005-12-16 21:35:19 +0100
committerSam Ravnborg <sam@mars.ravnborg.org>2005-12-16 21:35:19 +0100
commit6f6046cff2e8f04d6b916b10ebaa7b40d7e7967a (patch)
tree91a143eb6caba421b3f2f1c26d06bd8716da765e
parente067e1f98d54d62fd598126f95e7684e5b63e67f (diff)
downloadlinux-linaro-6f6046cff2e8f04d6b916b10ebaa7b40d7e7967a.tar.gz
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>
-rw-r--r--scripts/Makefile2
-rw-r--r--scripts/kconfig/Makefile3
-rw-r--r--scripts/kconfig/lxdialog/BIG.FAT.WARNING (renamed from scripts/lxdialog/BIG.FAT.WARNING)0
-rw-r--r--scripts/kconfig/lxdialog/Makefile (renamed from scripts/lxdialog/Makefile)0
-rw-r--r--scripts/kconfig/lxdialog/checklist.c (renamed from scripts/lxdialog/checklist.c)0
-rw-r--r--scripts/kconfig/lxdialog/colors.h (renamed from scripts/lxdialog/colors.h)0
-rw-r--r--scripts/kconfig/lxdialog/dialog.h (renamed from scripts/lxdialog/dialog.h)0
-rw-r--r--scripts/kconfig/lxdialog/inputbox.c (renamed from scripts/lxdialog/inputbox.c)0
-rw-r--r--scripts/kconfig/lxdialog/lxdialog.c (renamed from scripts/lxdialog/lxdialog.c)0
-rw-r--r--scripts/kconfig/lxdialog/menubox.c (renamed from scripts/lxdialog/menubox.c)2
-rw-r--r--scripts/kconfig/lxdialog/msgbox.c (renamed from scripts/lxdialog/msgbox.c)0
-rw-r--r--scripts/kconfig/lxdialog/textbox.c (renamed from scripts/lxdialog/textbox.c)0
-rw-r--r--scripts/kconfig/lxdialog/util.c (renamed from scripts/lxdialog/util.c)0
-rw-r--r--scripts/kconfig/lxdialog/yesno.c (renamed from scripts/lxdialog/yesno.c)0
-rw-r--r--scripts/kconfig/mconf.c2
15 files changed, 5 insertions, 4 deletions
diff --git a/scripts/Makefile b/scripts/Makefile
index 67763eeb8a3..6f6b48f39f0 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 9d67782b812..55bf95531f2 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 a8999d82bdb..a8999d82bdb 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 a45a13fb26e..a45a13fb26e 100644
--- a/scripts/lxdialog/Makefile
+++ b/scripts/kconfig/lxdialog/Makefile
diff --git a/scripts/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 3fb681fb963..3fb681fb963 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 db071df12bb..db071df12bb 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 f882204cb3c..f882204cb3c 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 779503726b0..779503726b0 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 2c34ea1e0a4..2c34ea1e0a4 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 2d91880825e..09512b54437 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 7323f5471f6..7323f5471f6 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 77848bb8e07..77848bb8e07 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 f82cebb9ff0..f82cebb9ff0 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 cb2568aae3e..cb2568aae3e 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 d1ad40531ee..d63d7fb677e 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);
}