more reorg

diff --git a/Rsconscript b/Rsconscript
index 521cf768ef4cb81353f6e5592d5db4b8c284ea3f..daebf07e699dd041c1939112e1efe00b8cb859c9 100644 (file)
--- a/Rsconscript
+++ b/Rsconscript
@@ -17,24 +17,22 @@ build do
 
   # Build library and binaries
   env.Library("libtide.a", glob("src/lib/**/*.c"))
-  glob("src/*.c").each do |src|
-    bin = File.basename(src).sub(/\.[^\.]$/,'')
-    env.Program("bin/#{bin}", [src, "libtide.a"])
-  end
 
   (glob("src/*/") - ["src/lib"]).each do |dir|
     bin = File.basename(dir)
     env.Program("bin/#{bin}", glob("#{dir}/**/*.c") + ["libtide.a"])
   end
 
-
   # Generate the documentation
   env.Command("", "tools/docgen",
     "CMD" => ["${_SOURCES}"],
     "CMD_DESC" => "Generating Docs")
 
   # Build and run unit tests
-  env.Program("tests/libedit", %w[tests/libedit.c tests/lib/buf.c tests/lib/utf8.c libtide.a])
+  tests = glob("tests/**/*.c") - ["tests/lib/win.c"]
+  srcs = glob("src/**/*.c").keep_if{|path| not path.end_with? "main.c" }
+  env.Library("libtest.a", tests + srcs)
+  env.Program("tests/libedit", ["libtest.a", "libtide.a"])
   env.Command("", "tests/libedit",
     "CMD" => ["${_SOURCES}"],
     "CMD_DESC" => "TEST")

diff --git a/src/fetchsel/fetchsel.c b/src/fetchsel/main.c
similarity index 100%
rename from src/fetchsel/fetchsel.c
rename to src/fetchsel/main.c

diff --git a/src/lib/buf.c b/src/tide/buf.c
similarity index 100%
rename from src/lib/buf.c
rename to src/tide/buf.c

diff --git a/src/lib/draw.c b/src/tide/draw.c
similarity index 100%
rename from src/lib/draw.c
rename to src/tide/draw.c

diff --git a/src/lib/editlog.c b/src/tide/editlog.c
similarity index 100%
rename from src/lib/editlog.c
rename to src/tide/editlog.c

diff --git a/src/lib/exec.c b/src/tide/exec.c
similarity index 100%
rename from src/lib/exec.c
rename to src/tide/exec.c

diff --git a/src/lib/gapbuf.c b/src/tide/gapbuf.c
similarity index 100%
rename from src/lib/gapbuf.c
rename to src/tide/gapbuf.c

diff --git a/src/tide/tide.c b/src/tide/main.c
similarity index 100%
rename from src/tide/tide.c
rename to src/tide/main.c

diff --git a/src/lib/view.c b/src/tide/view.c
similarity index 100%
rename from src/lib/view.c
rename to src/tide/view.c

diff --git a/tests/lib/win.c b/tests/lib/win.c
index 257adda6322b4833c4f2b82439c04365878a4474..0d8da419a390073b664cc0c6e29755e873cf71c7 100644 (file)
--- a/tests/lib/win.c
+++ b/tests/lib/win.c
@@ -1,6 +1,6 @@
 #define _XOPEN_SOURCE 700
-#include <atf.h>
-#include "src/tide.c"
+#include <test/atf.h>
+#include "src/tide/main.c"
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>