Reorg'd! I merged in the release-fixup branch and fixed all random warnings.

I also cleaned up the build script, the symlink generation is faster and looks
nicer, there's one think left to fix there, but it's not too bad.

1 files changed, 27 insertions, 4 deletions

diff --git a/default.bld b/default.bld
index 8f98db0..5660e99 100644
--- a/default.bld
+++ b/default.bld
@@ -17,7 +17,7 @@ CXXFLAGS += "-ggdb -W -Wall -I.";
 
 action "default"
 {
-        build: [targets("header-links"), "libbu++.a",
+        build: ["header-links", "libbu++.a",
                 targets("tools")];
 }
 
@@ -28,7 +28,7 @@ action "pkg"
 
 action "all"
 {
-        build: [targets("header-links"), "libbu++.a",
+        build: ["header-links", "libbu++.a",
                 targets("tools"), targets("tests")];
 }
 
@@ -60,6 +60,7 @@ target "src/version.h"
 target "src/signals.h"
 {
         input "gensigs.bld";
+        display "generate";
         profile "build"
         {
                 genSigs( OUTPUT );
@@ -80,7 +81,8 @@ target [files("src/*.h").replace("src/", "bu/"), "bu/autoconfig.h",
         input OUTPUT.replace("bu/","src/");
         profile "build"
         {
-                execute("mkdir -p $(dirname ${OUTPUT}); ln -s ../${INPUT} ${OUTPUT}");
+                DIR = OUTPUT.dirName();
+                execute("mkdir -p ${DIR}; ln -s ../${INPUT} ${OUTPUT}");
         }
 }
 
@@ -91,7 +93,18 @@ target files("src/compat/*.h").replace("src/", "bu/")
         input OUTPUT.replace("bu/","src/");
         profile "build"
         {
-                execute("mkdir -p $(dirname ${OUTPUT}); ln -s ../../${INPUT} ${OUTPUT}");
+                DIR = OUTPUT.dirName();
+                execute("mkdir -p ${DIR}; ln -s ../../${INPUT} ${OUTPUT}");
+        }
+}
+
+target "header-links"
+{
+        input targets("header-links");
+        display "symlinks";
+        profile "build"
+        {
+                condition always;
         }
 }
 
@@ -167,6 +180,16 @@ target ["tests/bzip2", "tests/streamstack"]
         LDFLAGS += "-lbz2";
 }
 
+target ["tests/deflate", "tests/enc"]
+{
+        LDFLAGS += "-lz";
+}
+
+target ["tests/lzma"]
+{
+        LDFLAGS += "-llzma";
+}
+
 target ["tests/itoserver", "tests/socketblock", "tests/itoheap",
         "tests/itoqueue1", "tests/itoqueue2", "tests/conduit"]
 {