From 6f6046cff2e8f04d6b916b10ebaa7b40d7e7967a Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Fri, 16 Dec 2005 21:35:19 +0100
Subject: [PATCH] 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>
---
scripts/Makefile | 2 +-
scripts/kconfig/Makefile | 3 ++-
scripts/{ => kconfig}/lxdialog/BIG.FAT.WARNING | 0
scripts/{ => kconfig}/lxdialog/Makefile | 0
scripts/{ => kconfig}/lxdialog/checklist.c | 0
scripts/{ => kconfig}/lxdialog/colors.h | 0
scripts/{ => kconfig}/lxdialog/dialog.h | 0
scripts/{ => kconfig}/lxdialog/inputbox.c | 0
scripts/{ => kconfig}/lxdialog/lxdialog.c | 0
scripts/{ => kconfig}/lxdialog/menubox.c | 2 +-
scripts/{ => kconfig}/lxdialog/msgbox.c | 0
scripts/{ => kconfig}/lxdialog/textbox.c | 0
scripts/{ => kconfig}/lxdialog/util.c | 0
scripts/{ => kconfig}/lxdialog/yesno.c | 0
scripts/kconfig/mconf.c | 2 +-
15 files changed, 5 insertions(+), 4 deletions(-)
rename scripts/{ => kconfig}/lxdialog/BIG.FAT.WARNING (100%)
rename scripts/{ => kconfig}/lxdialog/Makefile (100%)
rename scripts/{ => kconfig}/lxdialog/checklist.c (100%)
rename scripts/{ => kconfig}/lxdialog/colors.h (100%)
rename scripts/{ => kconfig}/lxdialog/dialog.h (100%)
rename scripts/{ => kconfig}/lxdialog/inputbox.c (100%)
rename scripts/{ => kconfig}/lxdialog/lxdialog.c (100%)
rename scripts/{ => kconfig}/lxdialog/menubox.c (99%)
rename scripts/{ => kconfig}/lxdialog/msgbox.c (100%)
rename scripts/{ => kconfig}/lxdialog/textbox.c (100%)
rename scripts/{ => kconfig}/lxdialog/util.c (100%)
rename scripts/{ => kconfig}/lxdialog/yesno.c (100%)
diff --git a/scripts/Makefile b/scripts/Makefile
index 67763eeb8a3e7..6f6b48f39f0ae 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 9d67782b812fb..55bf95531f2f6 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
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 --git a/scripts/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
similarity index 100%
rename from scripts/lxdialog/checklist.c
rename to scripts/kconfig/lxdialog/checklist.c
diff --git a/scripts/lxdialog/colors.h b/scripts/kconfig/lxdialog/colors.h
similarity index 100%
rename from scripts/lxdialog/colors.h
rename to scripts/kconfig/lxdialog/colors.h
diff --git a/scripts/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
similarity index 100%
rename from scripts/lxdialog/dialog.h
rename to scripts/kconfig/lxdialog/dialog.h
diff --git a/scripts/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
similarity index 100%
rename from scripts/lxdialog/inputbox.c
rename to scripts/kconfig/lxdialog/inputbox.c
diff --git a/scripts/lxdialog/lxdialog.c b/scripts/kconfig/lxdialog/lxdialog.c
similarity index 100%
rename from scripts/lxdialog/lxdialog.c
rename to scripts/kconfig/lxdialog/lxdialog.c
diff --git a/scripts/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
similarity index 99%
rename from scripts/lxdialog/menubox.c
rename to scripts/kconfig/lxdialog/menubox.c
index 2d91880825ed0..09512b5443759 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
similarity index 100%
rename from scripts/lxdialog/msgbox.c
rename to scripts/kconfig/lxdialog/msgbox.c
diff --git a/scripts/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
similarity index 100%
rename from scripts/lxdialog/textbox.c
rename to scripts/kconfig/lxdialog/textbox.c
diff --git a/scripts/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
similarity index 100%
rename from scripts/lxdialog/util.c
rename to scripts/kconfig/lxdialog/util.c
diff --git a/scripts/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
similarity index 100%
rename from scripts/lxdialog/yesno.c
rename to scripts/kconfig/lxdialog/yesno.c
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d1ad40531ee5a..d63d7fb677e4c 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);
}
--
GitLab