Build the utilities.

build.py

@@ -6,6 +6,7 @@ from build.pkg import package
 package(name="protobuf_lib", package="protobuf")
 package(name="z_lib", package="zlib")
 package(name="fmt_lib", package="fmt")
+package(name="sqlite3_lib", package="sqlite3")
 
 clibrary(name="protocol", hdrs={"protocol.h": "./protocol.h"})
 
@@ -14,6 +15,12 @@ protocc(name="fl2_proto_lib", srcs=["+fl2_proto"])
 
 export(
     name="all",
-    items={"fluxengine": "src+fluxengine", "fluxengine-gui": "src/gui"},
+    items={
+        "fluxengine": "src+fluxengine",
+        "fluxengine-gui": "src/gui",
+        "brother120tool": "tools+brother120tool",
+        "brother240tool": "tools+brother240tool",
+        "upgrade-flux-file": "tools+upgrade-flux-file",
+    },
     deps=["+protocol"],
 )

tools/brother120tool.cc

@@ -1,7 +1,7 @@
-#include "globals.h"
-#include "bytes.h"
+#include "lib/globals.h"
+#include "lib/bytes.h"
 #include "fmt/format.h"
-#include "utils.h"
+#include "lib/utils.h"
 #include <fstream>
 #include "fnmatch.h"
 

tools/brother240tool.cc

@@ -1,4 +1,4 @@
-#include "globals.h"
+#include "lib/globals.h"
 #include "fmt/format.h"
 #include <fstream>
 

tools/upgrade-flux-file.cc

@@ -1,7 +1,7 @@
-#include "globals.h"
-#include "fluxmap.h"
-#include "fluxsink/fluxsink.h"
-#include "bytes.h"
+#include "lib/globals.h"
+#include "lib/fluxmap.h"
+#include "lib/fluxsink/fluxsink.h"
+#include "lib/bytes.h"
 #include "fmt/format.h"
 #include <string.h>
 #include <fstream>