From c06106bff84935c4622b303aef417c41ac300a91 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@netapp.com>
Date: Fri, 28 Oct 2011 14:17:59 -0400
Subject: [PATCH] Remove config system

It was an interesting idea, but it really wasn't being used for
anything.  I'll stop trying to copy Kbuild now...
---
 Sconstruct | 19 ++++++-------------
 config     |  2 --
 2 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 config

diff --git a/Sconstruct b/Sconstruct
index 611eb27d..8e82cf84 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -1,21 +1,14 @@
 MAJOR = 5
 MINOR = 3
 BUG   = 0
-
-CONFIG={"FLAGS":[]}
-def read_config():
-	for line in open("config"):
-		(key, value) = line.strip().split("=")
-		CONFIG[key] = value
-		if value == "y":
-			CONFIG["FLAGS"] += ["-D"+key]
-read_config()
+EXTRA = ""
+DEBUG = True
 
 FLAGS = ["-O2"]
-if CONFIG["DEBUG"] == "y":
-	FLAGS = ["-Wall", "-Werror", "-g"]
+if DEBUG == True:
+	FLAGS = ["-Wall", "-Werror", "-g", "-DDEBUG"]
 
-env = Environment(CCFLAGS = FLAGS + CONFIG["FLAGS"])
+env = Environment(CCFLAGS = FLAGS)
 if ARGUMENTS.get('VERBOSE') != "1":
 	env.Append(CXXCOMSTR = "CXX $TARGET")
 	env.Append(LINKCOMSTR = "Linking $TARGET")
@@ -31,7 +24,7 @@ def version_h():
 		line = line.replace("__MAJOR__", str(MAJOR))
 		line = line.replace("__MINOR__", str(MINOR))
 		line = line.replace("__BUG__",   str(BUG))
-		line = line.replace("__EXTRA__", CONFIG["EXTRA"])
+		line = line.replace("__EXTRA__", str(EXTRA))
 		f.write(line)
 	f.close()
 version_h()
diff --git a/config b/config
deleted file mode 100644
index 0d8e4300..00000000
--- a/config
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA=
-DEBUG=y