[PATCH] remove old config tools

This deletes the old config tools and moves Michael's maintainer entry
for them to CREDITS and I added myself for KCONFIG instead.

CREDITS

@@ -533,6 +533,10 @@ S: Tamsui town, Taipei county,
 S: Taiwan 251
 S: Republic of China
 
+N: Michael Elizabeth Chastain
+E: mec@shout.net
+D: Configure, Menuconfig, xconfig
+
 N: Raymond Chen
 E: raymondc@microsoft.com
 D: Author of Configure script

MAINTAINERS

@@ -379,13 +379,6 @@ P:	Gergely Madarasz
 M:	Gergely Madarasz <gorgo@itc.hu>
 S:	Supported
 
-CONFIGURE, MENUCONFIG, XCONFIG
-P:	Michael Elizabeth Chastain
-M:	mec@shout.net
-L:	kbuild-devel@lists.sourceforge.net
-W:	http://kbuild.sourceforge.net
-S:	Maintained
-
 COSA/SRP SYNC SERIAL DRIVER
 P:	Jan "Yenya" Kasprzak
 M:	kas@fi.muni.cz
@@ -942,6 +935,12 @@ L:	linux-joystick@atrey.karlin.mff.cuni.cz
 W:	http://www.suse.cz/development/joystick/
 S:	Maintained
 
+KCONFIG
+P:	Roman Zippel
+M:	zippel@linux-m68k.org
+L:	kbuild-devel@lists.sourceforge.net
+S:	Maintained
+
 KERNEL AUTOMOUNTER (AUTOFS)
 P:	H. Peter Anvin
 M:	hpa@zytor.com

scripts/Makefile

@@ -7,7 +7,6 @@
 #                include/config/...
 # docproc: 	 Preprocess .tmpl file in order to generate .sgml documentation
 # conmakehash:	 Create arrays for initializing the kernel console tables
-# tkparse: 	 Used by xconfig
 
 EXTRA_TARGETS := fixdep split-include docproc conmakehash
 
@@ -23,33 +22,10 @@ KBUILD_BUILTIN := 1
 # can't do it
 # ---------------------------------------------------------------------------
 
-host-progs := fixdep split-include conmakehash docproc tkparse
-tkparse-objs := tkparse.o tkcond.o tkgen.o
-
-clean-files := kconfig.tk
+host-progs := fixdep split-include conmakehash docproc
 
 include $(TOPDIR)/Rules.make
 
-# In reality kconfig.tk should depend on all Config.in files,
-# but it is not worth the effort to generate the dependencies.
-# The alternative solution to always generate it is fairly fast.
-# FORCE it to remake
-$(obj)/kconfig.tk: $(srctree)/arch/$(ARCH)/config.in $(obj)/tkparse FORCE
-	@echo '  Generating $@'
-	@(                                                      \
-	if [ -f /usr/local/bin/wish ];        then              \
-		echo '#!'"/usr/local/bin/wish -f";              \
-	else                                                    \
-		echo '#!'"/usr/bin/wish -f";                    \
-	fi;                                                     \
-	cat $(src)/header.tk;                                   \
-	$(obj)/tkparse < $<;                                    \
-	echo "set defaults \"arch/${ARCH}/defconfig\"";         \
-	echo "set ARCH \"${ARCH}\"";                            \
-	cat $(src)/tail.tk;                                     \
-	) > $@
-	@chmod 755 $@
-
 
 # ---------------------------------------------------------------------------
 # Targets hardcoded and wellknow in top-level makefile
@@ -58,5 +34,5 @@ lxdialog:
 	$(call descend,scripts/lxdialog,)
 
 # fixdep is needed to compile other host programs
-$(obj)/split-include $(obj)/docproc $(addprefix $(obj)/,$(tkparse-objs)) \
+$(obj)/split-include $(obj)/docproc \
 $(obj)/conmakehash lxdialog: $(obj)/fixdep

scripts/tail.tk

-# FILE: tail.tk
-# This file is boilerplate TCL/TK function definitions for 'make xconfig'.
-#
-# CHANGES
-# =======
-#
-# 8 January 1998, Michael Elizabeth Chastain, <mec@shout.net>
-# Arrange buttons in three columns for better screen fitting.
-#
-
-#
-# Read the user's settings from .config.  These will override whatever is
-# in config.in.  Don't do this if the user specified a -D to force
-# the defaults.
-#
-if { [file readable .config] == 1} then {
-	if { $argc > 0 } then {
-		if { [lindex $argv 0] != "-D" } then {
-			read_config .config
-		}
-		else
-		{
-			read_config $defaults
-		}
-	} else {
-		read_config .config
-	}
-} else {
-	read_config $defaults
-}
-
-update_define 1 $total_menus 0
-update_mainmenu
-
-button .f0.right.save -anchor w -text "Save and Exit" -underline 0\
-    -command { catch {exec cp -f .config .config.old}; \
-		writeconfig .config include/linux/autoconf.h; wrapup .wrap }
-
-button .f0.right.quit -anchor w -text "Quit Without Saving" -underline 0\
-    -command { maybe_exit .maybe }
-
-button .f0.right.load -anchor w -text "Load Configuration from File" \
-    -command { load_configfile .load "Load Configuration from file" read_config_file
-}
-
-button .f0.right.store -anchor w -text "Store Configuration to File" \
-    -command { load_configfile .load "Store Configuration to file" write_config_file }
-
-#
-# Now pack everything.
-#
-
-pack .f0.right.store .f0.right.load .f0.right.quit .f0.right.save \
-    -padx 0 -pady 0 -side bottom -fill x
-pack .f0.left .f0.middle .f0.right -side left -padx 5 -pady 0 -fill y
-pack .f0 -padx 5 -pady 5
-
-update idletasks
-set winy [expr 10 + [winfo reqheight .f0]]
-set scry [lindex [wm maxsize .] 1]
-set winx [expr 10 + [winfo reqwidth .f0]]
-set scrx [lindex [wm maxsize .] 0]
-if {$winx < $scrx} then {set maxx -1} else {set maxx $winx}
-if {$winy < $scry} then {set maxy -1} else {set maxy $winy}
-.f0 configure -width $winx -height $winy 
-wm maxsize . $maxx $maxy
-
-#
-# If we cannot write our config files, disable the write button.
-#
-if { [file exists .config] == 1 } then {
-		if { [file writable .config] == 0 } then {
-			.f0.right.save configure -state disabled
-		}
-	} else {
-		if { [file writable .] == 0 } then {
-			.f0.right.save configure -state disabled
-		}
-	}
-
-if { [file exists include/linux/autoconf.h] == 1 } then {
-		if { [file writable include/linux/autoconf.h] == 0 } then {
-			.f0.right.save configure -state disabled
-		}
-	} else {
-		if { [file writable include/linux/] == 0 } then {
-			.f0.right.save configure -state disabled
-		}
-	}

scripts/tkparse.h

-/*
- * tkparse.h
- */
-
-/*
- * Token types (mostly statement types).
- */
-
-enum e_token
-{
-    token_UNKNOWN,
-    token_bool, 
-    token_choice_header,
-    token_choice_item,
-    token_comment, 
-    token_define_bool,
-    token_define_hex,
-    token_define_int,
-    token_define_string,
-    token_define_tristate,
-    token_dep_bool,
-    token_dep_mbool,
-    token_dep_tristate,
-    token_else, 
-    token_endmenu,
-    token_fi, 
-    token_hex,
-    token_if, 
-    token_int,
-    token_mainmenu_name, 
-    token_mainmenu_option, 
-    token_source,
-    token_string,
-    token_then,
-    token_tristate, 
-    token_unset,
-};
-
-/*
- * Operator types for conditionals.
- */
-
-enum operator
-{
-    op_eq,
-    op_neq,
-    op_and,
-    op_and1,
-    op_or,
-    op_bang,
-    op_lparen,
-    op_rparen,
-    op_constant,
-    op_variable,
-    op_true,
-    op_false,
-    op_nuked
-};
-
-/*
- * Conditions come in linked lists.
- * Some operators take strings:
- *
- *   op_constant   "foo"
- *   op_variable   "$ARCH", "$CONFIG_PMAC", "$CONFIG_EXPERIMENTAL"
- *
- * Most "$..." constructs refer to a variable which is defined somewhere
- * in the script.  Note that it is legal to test variables which are never
- * defined, such as variables that are meaningful only on other architectures.
- */
-
-struct condition
-{
-    struct condition *	next;
-    enum operator	op;
-    const char *	str;		/* op_constant */
-    int			nameindex;	/* op_variable */
-};
-
-/*
- * Dependency list for dep_bool, dep_mbool, dep_tristate
- */
-
-struct dependency
-{
-    char *		name;
-    struct dependency *	next;
-};
-
-/*
- * A statement from a config.in file
- */
-
-struct kconfig
-{
-    struct kconfig *	next;
-    enum e_token	token;
-    int			nameindex;
-    char *		label;
-    char *		value;
-    struct condition *	cond;
-    struct dependency *	depend;		/* token_dep_tristate */
-    struct kconfig *	cfg_parent;	/* token_choice_item */
-
-    /* used only in tkgen.c */
-    int			menu_number;
-    int			menu_line;
-    struct kconfig *	menu_next;
-};
-
-struct variable
-{
-    char *	name;
-    char	defined;
-    char	global_written;
-};
-
-extern struct variable *vartable;
-extern int max_varnum;
-
-/*
- * Prototypes
- */
-
-extern void fix_conditionals ( struct kconfig * scfg );		/* tkcond.c */
-extern void dump_tk_script   ( struct kconfig * scfg );		/* tkgen.c  */
-extern int get_varnum        ( char * name );			/* tkparse.c */