Index: tools/config.py
===================================================================
--- tools/config.py	(revision 3c80f2ba924af168dfc3e3a650b8f57db0fe8c00)
+++ tools/config.py	(revision c621f4aa64c16cb4d9c2b20dbf5be59c66c25ed3)
@@ -43,5 +43,4 @@
 MAKEFILE = 'Makefile.config'
 MACROS = 'config.h'
-DEFS = 'config.defs'
 PRECONF = 'defaults'
 
@@ -225,5 +224,5 @@
 	return True
 
-def create_output(mkname, mcname, dfname, defaults, ask_names):
+def create_output(mkname, mcname, defaults, ask_names):
 	"Create output configuration"
 	
@@ -249,5 +248,4 @@
 	outmk = file(mkname, 'w')
 	outmc = file(mcname, 'w')
-	outdf = file(dfname, 'w')
 	
 	outmk.write('#########################################\n')
@@ -259,8 +257,5 @@
 	outmc.write(' ***************************************/\n\n')
 	
-	outdf.write('#########################################\n')
-	outdf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
-	outdf.write('#########################################\n\n')
-	outdf.write('CONFIG_DEFS =')
+	defs = 'CONFIG_DEFS ='
 	
 	for varname, vartype, name, choices, cond in ask_names:
@@ -280,21 +275,22 @@
 			if (default == "y"):
 				outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
-				outdf.write(' -D%s' % varname)
+				defs += ' -D%s' % varname
 		else:
 			outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, default, varname, default))
-			outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
+			defs += ' -D%s=%s -D%s_%s' % (varname, default, varname, default)
 	
 	if (revision is not None):
 		outmk.write('REVISION = %s\n' % revision)
 		outmc.write('#define REVISION %s\n' % revision)
-		outdf.write(' "-DREVISION=%s"' % revision)
+		defs += ' "-DREVISION=%s"' % revision
 	
 	outmk.write('TIMESTAMP = %s\n' % timestamp)
 	outmc.write('#define TIMESTAMP %s\n' % timestamp)
-	outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
+	defs += ' "-DTIMESTAMP=%s"\n' % timestamp
+	
+	outmk.write(defs)
 	
 	outmk.close()
 	outmc.close()
-	outdf.close()
 
 def sorted_dir(root):
@@ -355,5 +351,5 @@
 	if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
 		if (check_choices(defaults, ask_names)):
-			create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
+			create_output(MAKEFILE, MACROS, defaults, ask_names)
 			return 0
 	
@@ -473,5 +469,5 @@
 		xtui.screen_done(screen)
 	
-	create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
+	create_output(MAKEFILE, MACROS, defaults, ask_names)
 	return 0