1 files changed, 6 insertions, 5 deletions

diff --git a/build.conf b/build.conf
index 640fbff..8f06532 100644
--- a/build.conf
+++ b/build.conf
@@ -4,7 +4,8 @@ default action: check "build"
 "clean" action: clean "build"
 "rebuild" action: clean "build", check "build"
 
-set "CXXFLAGS" += "-ggdb"
+set "CXXFLAGS" += "-ggdb -Ilibbu++/src"
+set "LDFLAGS" += "-Llibbu++ -lbu++ -ldl"
 
 "build":
         rule "exe",
@@ -15,13 +16,13 @@ set "CXXFLAGS" += "-ggdb"
 
 rule "exe":
         matches regexp("(.*)\\.o$"),
-        input filter toString(),
-        perform command("g++ {LDFLAGS} -o {target} {match}")
+        aggregate toString(" "),
+        perform command("g++ -o {target} {match} {LDFLAGS}")
 
 rule "cpp":
-        matches regexp("(.*)\\.cpp$"),
+        matches regexp("(.*)\\.(cpp|c)$"),
         produces "{re:1}.o",
-        requires commandToList("g++ -M {match}", "make"),
+        requires commandToList("g++ -M {CXXFLAGS} {match}", "make"),
         perform command("g++ {CXXFLAGS} -c -o {target} {match}")
 
 rule "bison":