1 files changed, 20 insertions, 28 deletions

diff --git a/build.conf b/build.conf
index 4d2e61b..6a1b611 100644
--- a/build.conf
+++ b/build.conf
@@ -1,43 +1,35 @@
 # build.conf for build, kind of whacky, eh?
 
-default action: check "build", check "cleanup"
-"clean" action: clean ["build", "cleanup"]
+default action: check "build"
+"clean" action: clean "build"
+"rebuild" action: clean "build", check "build"
 
 set "CXXFLAGS" += "-ggdb"
 
-["build", "cleanup"]:
-        rule "exe",
-        target file,
-        set "CXXFLAGS" = "-lBob",
-        input [filesIn("src/{target}"), filesIn("src/shared")]
-
-[directoriesIn("src/tests")] filter regexp("src/tests/(.*)", "tests/{re:1}"):
-        rule "exe",
-        target prefix "tests/",
-        target file,
-        input filesIn("src/tests/{target}")
-
-[directoriesIn("src/tests"), "aoeua"]:
+"build":
         rule "exe",
         target file,
-        input filesIn("src/{target}")
-
-"build":
-        input [filesIn("src"), "boy.cpp"] filter regexp(".*\\.cpp$"),
-        input filter regexp(".*\\.cpp$"),
-        requires ["bob.cpp", "libbuild.a", "libbu++/libbu++.a"]
-
-"bob.cpp": set "aoeu" = "food", requires "bob.bastard"
+        requires "libbu++/libbu++.a",
+        set "CXXFLAGS" += "-Ilibbu++/src",
+        input filesIn("src")
 
 rule "exe":
         matches regexp("(.*)\\.o$"),
         input filter toString(),
-        perform command("stuff")
+        perform command("g++ {LDFLAGS} -o {target} {match}")
 
 rule "cpp":
         matches regexp("(.*)\\.cpp$"),
         produces "{re:1}.o",
-        requires commandToList("make", "g++ -M {match}"),
-        perform command("stuff")
-
-
+        requires commandToList("g++ -M {match}", "make"),
+        perform command("g++ {CXXFLAGS} -c -o {target} {match}")
+
+rule "bison":
+        matches regexp("(.*)\\.y$"),
+        produces ["{re:1}.tab.c", "{re:1}.tab.h", "{re:1}.output"],
+        perform command("bison -v -b{re:1} {match}")
+
+rule "flex":
+        matches regexp("(.*)\\.l$"),
+        produces "{re:1}.yy.c",
+        perform command("flex --bison-bridge --bison-locations -o {target} {match}")