---

yaml --- r: 15891 b: refs/heads/master c: 6f6046c h: refs/heads/master i: 15889: 85fc8ea 15887: 5fec7bd v: v3
git-mirror · Dec 16, 2005 · 25cb2c3 · 25cb2c3
1 parent 05081b7
commit 25cb2c3
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e067e1f98d54d62fd598126f95e7684e5b63e67f
+refs/heads/master: 6f6046cff2e8f04d6b916b10ebaa7b40d7e7967a
diff --git a/trunk/scripts/Makefile b/trunk/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/trunk/scripts/kconfig/Makefile b/trunk/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/trunk/scripts/lxdialog/BIG.FAT.WARNING → .../scripts/kconfig/lxdialog/BIG.FAT.WARNING b/trunk/scripts/lxdialog/BIG.FAT.WARNING → .../scripts/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/trunk/scripts/lxdialog/Makefile → trunk/scripts/kconfig/lxdialog/Makefile b/trunk/scripts/lxdialog/Makefile → trunk/scripts/kconfig/lxdialog/Makefile
diff --git a/trunk/scripts/lxdialog/checklist.c → trunk/scripts/kconfig/lxdialog/checklist.c b/trunk/scripts/lxdialog/checklist.c → trunk/scripts/kconfig/lxdialog/checklist.c
diff --git a/trunk/scripts/lxdialog/colors.h → trunk/scripts/kconfig/lxdialog/colors.h b/trunk/scripts/lxdialog/colors.h → trunk/scripts/kconfig/lxdialog/colors.h
diff --git a/trunk/scripts/lxdialog/dialog.h → trunk/scripts/kconfig/lxdialog/dialog.h b/trunk/scripts/lxdialog/dialog.h → trunk/scripts/kconfig/lxdialog/dialog.h
diff --git a/trunk/scripts/lxdialog/inputbox.c → trunk/scripts/kconfig/lxdialog/inputbox.c b/trunk/scripts/lxdialog/inputbox.c → trunk/scripts/kconfig/lxdialog/inputbox.c
diff --git a/trunk/scripts/lxdialog/lxdialog.c → trunk/scripts/kconfig/lxdialog/lxdialog.c b/trunk/scripts/lxdialog/lxdialog.c → trunk/scripts/kconfig/lxdialog/lxdialog.c
diff --git a/trunk/scripts/lxdialog/menubox.c → trunk/scripts/kconfig/lxdialog/menubox.c b/trunk/scripts/lxdialog/menubox.c → trunk/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/trunk/scripts/lxdialog/msgbox.c → trunk/scripts/kconfig/lxdialog/msgbox.c b/trunk/scripts/lxdialog/msgbox.c → trunk/scripts/kconfig/lxdialog/msgbox.c
diff --git a/trunk/scripts/lxdialog/textbox.c → trunk/scripts/kconfig/lxdialog/textbox.c b/trunk/scripts/lxdialog/textbox.c → trunk/scripts/kconfig/lxdialog/textbox.c
diff --git a/trunk/scripts/lxdialog/util.c → trunk/scripts/kconfig/lxdialog/util.c b/trunk/scripts/lxdialog/util.c → trunk/scripts/kconfig/lxdialog/util.c
diff --git a/trunk/scripts/lxdialog/yesno.c → trunk/scripts/kconfig/lxdialog/yesno.c b/trunk/scripts/lxdialog/yesno.c → trunk/scripts/kconfig/lxdialog/yesno.c
diff --git a/trunk/scripts/kconfig/mconf.c b/trunk/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);
 }