Merged Ito and put it in the BU namespace. I should probably clean up the

formatting on the comments, some of the lines wrap, but I'm not too worried
about it right now.  I also fixed up the doxygen config and build.conf files
so that everything is building nice and smooth now.

1 files changed, 21 insertions, 5 deletions

diff --git a/build.conf b/build.conf
index bc186f9..c289205 100644
--- a/build.conf
+++ b/build.conf
@@ -1,13 +1,17 @@
 # This is a build file for libbu++
 
-default action: check "libbu++.a"
-"clean" action: clean targets()
-"tests" action: check targets() filter regexp("^tests/.*$")
-"all" action: check targets()
-"fstring" action: check "tests/fstring"
+default action: check group "lnhdrs", check "libbu++.a"
+"tests" action: check group "lnhdrs", check group "tests"
+"all" action: check group "lnhdrs", check targets()
 
 set "CXXFLAGS" += "-ggdb -Wall"
 
+filesIn("src") filter regexp("^src/(.*)\\.h$", "src/bu/{re:1}.h"):
+        rule "hln",
+        group "lnhdrs",
+        target file,
+        input "src/{re:1}.h"
+
 "libbu++.a":
         rule "lib",
         target file,
@@ -17,6 +21,7 @@ set "CXXFLAGS" += "-ggdb -Wall"
 directoriesIn("src/tests","tests/"):
         rule "exe",
         target file,
+        group "tests",
         requires "libbu++.a",
         set "CXXFLAGS" += "-Isrc",
         set "LDFLAGS" += "-L. -lbu++",
@@ -25,14 +30,18 @@ directoriesIn("src/tests","tests/"):
 filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"):
         rule "exe",
         target file,
+        group "tests",
         requires "libbu++.a",
         set "CXXFLAGS" += "-Isrc",
         set "LDFLAGS" += "-L. -lbu++",
         input "src/{target}.cpp"
 
+["tests/itoqueue1", "tests/itoqueue2"]: set "LDFLAGS" += "-lpthread"
+
 directoriesIn("src/unit","unit/"):
         rule "exe",
         target file,
+        group "tests",
         requires "libbu++.a",
         set "CXXFLAGS" += "-Isrc",
         set "LDFLAGS" += "-L. -lbu++",
@@ -41,6 +50,7 @@ directoriesIn("src/unit","unit/"):
 filesIn("src/unit") filter regexp("^src/unit/(.*)\\.cpp$", "unit/{re:1}"):
         rule "exe",
         target file,
+        group "tests",
         requires "libbu++.a",
         set "CXXFLAGS" += "-Isrc",
         set "LDFLAGS" += "-L. -lbu++",
@@ -63,3 +73,9 @@ rule "cpp":
         produces "{re:1}.o",
         requires commandToList("g++ -M {CXXFLAGS} {match}", "make"),
         perform command("g++ {CXXFLAGS} -c -o {target} {match}")
+
+rule "hln":
+        matches regexp("src/(.*)\\.h"),
+        produces "src/bu/{re:1}.h",
+        perform command("ln -s ../{re:1}.h {target}")
+