Finally eliminate the +lib target.

build.py

@@ -19,36 +19,6 @@ hostpackage(name="sqlite3_host_lib", package="sqlite3")
 
 clibrary(name="protocol", hdrs={"protocol.h": "./protocol.h"})
 
-cxxlibrary(
-    name="lib",
-    srcs=[
-        "./lib/readerwriter.cc",
-    ],
-    hdrs={
-        "lib/readerwriter.h": "./lib/readerwriter.h",
-    },
-    deps=[
-        "+fmt_lib",
-        "+protocol",
-        "dep/adflib",
-        "dep/fatfs",
-        "dep/hfsutils",
-        "dep/libusbp",
-        "dep/stb",
-        "src/formats",
-        "lib/core",
-        "lib/config",
-        "lib/data",
-        "lib/external",
-        "lib/fluxsink",
-        "lib/fluxsource",
-        "lib/imagereader",
-        "lib/imagewriter",
-        "lib/decoders",
-        "lib/encoders",
-    ],
-)
-
 corpustests = []
 if not glob("../fluxengine-testdata/data"):
     print("fluxengine-testdata not found; skipping corpus tests")

lib/algorithms/build.py

@@ -0,0 +1,21 @@
+from build.c import cxxlibrary
+
+cxxlibrary(
+    name="algorithms",
+    srcs=["./readerwriter.cc"],
+    hdrs={
+        "lib/algorithms/readerwriter.h": "./readerwriter.h",
+    },
+    deps=[
+        "lib/core",
+        "lib/config",
+        "lib/data",
+        "lib/usb",
+        "lib/encoders",
+        "lib/decoders",
+        "lib/fluxsource",
+        "lib/fluxsink",
+        "lib/imagereader",
+        "lib/imagewriter",
+    ],
+)

lib/algorithms/readerwriter.cc

@@ -2,7 +2,7 @@
 #include "lib/config/config.h"
 #include "lib/config/flags.h"
 #include "lib/data/fluxmap.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "protocol.h"
 #include "lib/usb/usb.h"
 #include "lib/encoders/encoders.h"

lib/vfs/build.py

@@ -46,9 +46,12 @@ cxxlibrary(
         "lib/vfs/vfs.h": "./vfs.h",
     },
     deps=[
-        "+lib",
         "+fmt_lib",
         "arch",
+        "lib/algorithms",
         ".+proto_lib",
+        "dep/hfsutils",
+        "dep/adflib",
+        "dep/fatfs",
     ],
 )

lib/vfs/fluxsectorinterface.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/sectorinterface.h"
 #include "lib/data/image.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/decoders/decoders.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/data/layout.h"

src/build.py

@@ -31,7 +31,6 @@ cxxprogram(
     cflags=["-I."],
     deps=[
         "+fmt_lib",
-        "+lib",
         "+protobuf_lib",
         "+protocol",
         "+z_lib",
@@ -46,6 +45,7 @@ cxxprogram(
         "lib/data",
         "lib/external",
         "lib/vfs",
+        "lib/algorithms",
         "arch",
         "src/formats",
     ],

src/fe-putfile.cc

@@ -3,7 +3,7 @@
 #include "lib/data/fluxmap.h"
 #include "lib/data/sector.h"
 #include "lib/config/proto.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/fluxsource/fluxsource.h"

src/fe-rawread.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/config/config.h"
 #include "lib/config/flags.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/data/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

src/fe-rawwrite.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/config/config.h"
 #include "lib/config/flags.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/data/fluxmap.h"
 #include "lib/data/sector.h"
 #include "lib/config/proto.h"

src/fe-read.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/config/config.h"
 #include "lib/config/flags.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/data/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

src/fe-write.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/config/config.h"
 #include "lib/config/flags.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/data/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"

src/fileutils.cc

@@ -4,7 +4,7 @@
 #include "lib/data/fluxmap.h"
 #include "lib/data/sector.h"
 #include "lib/config/proto.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/imagereader/imagereader.h"

src/gui/build.py

@@ -63,7 +63,6 @@ cxxprogram(
         "dep/hfsutils",
         "dep/libusbp",
         "extras+icons",
-        "+lib",
         "lib/core",
         "lib/data",
         "lib/vfs",

src/gui/drivetypes/build.py

@@ -32,5 +32,5 @@ protoencode(
 cxxlibrary(
     name="drivetypes",
     srcs=[".+drivetypes_cc", ".+drivetypes_table_cc"],
-    deps=["+lib"],
+    deps=["lib/core", "lib/config"],
 )

src/gui/imagerpanel.cc

@@ -8,7 +8,7 @@
 #include "lib/encoders/encoders.h"
 #include "lib/decoders/decoders.h"
 #include "lib/config/proto.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "gui.h"
 #include "lib/data/layout.h"
 #include "fluxviewerwindow.h"

src/gui/mainwindow.cc

@@ -3,7 +3,7 @@
 #include "lib/config/proto.h"
 #include "gui.h"
 #include "lib/core/logger.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/imagereader/imagereader.h"

tests/build.py

@@ -54,7 +54,6 @@ export(
                 deps=[
                     "lib/external+fl2_proto_lib",
                     "+fmt_lib",
-                    "+lib",
                     "+protobuf_lib",
                     "+protocol",
                     "+z_lib",
@@ -84,7 +83,6 @@ export(
                 deps=[
                     "lib/external+fl2_proto_lib",
                     "+fmt_lib",
-                    "+lib",
                     "+protobuf_lib",
                     "+protocol",
                     "+z_lib",
@@ -96,6 +94,7 @@ export(
                     "dep/libusbp",
                     "dep/snowhouse",
                     "dep/stb",
+                    "lib/algorithms",
                     "lib/config",
                     "lib/core",
                     "lib/data",

tools/build.py

@@ -10,13 +10,14 @@ cxxprogram(
     srcs=["./brother120tool.cc"],
     deps=[
         "+fmt_lib",
-        "+lib",
         "+protobuf_lib",
         "+z_lib",
         "lib/config",
         "lib/core",
         "lib/data",
         "lib/fluxsource+proto_lib",
+        "lib/algorithms",
+        "src/formats",
     ]
     + emu,
 )
@@ -26,13 +27,14 @@ cxxprogram(
     srcs=["./brother240tool.cc"],
     deps=[
         "+fmt_lib",
-        "+lib",
         "+protobuf_lib",
         "+z_lib",
         "lib/config",
         "lib/core",
         "lib/data",
         "lib/fluxsource+proto_lib",
+        "lib/algorithms",
+        "src/formats",
     ]
     + emu,
 )
@@ -42,7 +44,6 @@ cxxprogram(
     srcs=["./upgrade-flux-file.cc"],
     deps=[
         "+fmt_lib",
-        "+lib",
         "+protobuf_lib",
         "+protocol",
         "+sqlite3_lib",
@@ -53,6 +54,7 @@ cxxprogram(
         "lib/data",
         "lib/external+fl2_proto_lib",
         "lib/fluxsource+proto_lib",
+        "lib/algorithms",
         "src/formats",
     ],
 )