Sorter debugging tools can be compiled again

diff --git a/debug/default.cfg b/debug/default.cfg
index cca794ec80813fac8eec515409369bd523f1efad..f6593577d8b76a72df39fce13921bce1e31a66c4 100644 (file)
--- a/debug/default.cfg
+++ b/debug/default.cfg
@@ -5,6 +5,7 @@ Include("default.cfg");
 Set("CONFIG_LOCAL");
 UnSet("CONFIG_SHARED");
 Set("CONFIG_DEBUG");
+Set("CONFIG_UCW_DEBUG_TOOLS");
 Set("CONFIG_EXACT_CPU");
 
 Set("CONFIG_IMAGES");

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 4d25df7d5d47b7873acf2381525e1bae01403fee..a85b77680c388c9172f87a6271f0ac70f3ac2b52 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -66,5 +66,8 @@ Set("CONFIG_UCW_FB_DIRECT");
 UnSet("CONFIG_UCW_POSIX_REGEX");
 UnSet("CONFIG_UCW_PCRE");
 
+# Compile tools used for debugging and testing of LibUCW
+UnSet("CONFIG_UCW_DEBUG_TOOLS");
+
 # Return success
 1;

diff --git a/ucw/sorter/Makefile b/ucw/sorter/Makefile
index 7b7d7c0703211d43b823601a9423e38a2b1f71a7..6bf98ed457c3293d75a26a8391ad4b0e56472802 100644 (file)
--- a/ucw/sorter/Makefile
+++ b/ucw/sorter/Makefile
@@ -7,8 +7,9 @@ LIBUCW_SORTER_INCLUDES=$(addprefix sorter/, array.h array-simple.h common.h s-fi
        s-internal.h s-multiway.h s-radix.h s-twoway.h sorter.h)
 LIBUCW_INCLUDES+=$(LIBUCW_SORTER_INCLUDES)
 
-ifdef CONFIG_DEBUG_TOOLS
+ifdef CONFIG_UCW_DEBUG_TOOLS
 PROGS+=$(o)/ucw/sorter/sort-test
+include $(s)/ucw/sorter/debug/Makefile
 endif
 
 TESTS+=$(o)/ucw/sorter/sort-test.test

diff --git a/ucw/sorter/debug/Makefile b/ucw/sorter/debug/Makefile
index 1ef8c6205b7b53392e2a67d7e2cb2cef7440f3bb..e489e5b8f5f7f12898fd6d4a55f3278e5b49088c 100644 (file)
--- a/ucw/sorter/debug/Makefile
+++ b/ucw/sorter/debug/Makefile
@@ -1,10 +1,10 @@
 # Tests related to the new sorter
 
-DIRS+=debug/sorter
-PROGS+=$(addprefix $(o)/debug/sorter/,radix-tune-bits radix-tune-thresh)
+DIRS+=ucw/sorter/debug
+PROGS+=$(addprefix $(o)/ucw/sorter/debug/,radix-tune-bits radix-tune-thresh retros)
 
-$(o)/debug/sorter/retros: $(o)/debug/sorter/retros.o $(LIBSH)
-$(o)/debug/sorter/radix-file-test: $(o)/debug/sorter/radix-file-test.o $(LIBSH)
-$(o)/debug/sorter/radix-asio-test: $(o)/debug/sorter/radix-asio-test.o $(LIBSH)
-$(o)/debug/sorter/radix-tune-bits: $(s)/debug/sorter/radix-tune-bits.sh
-$(o)/debug/sorter/radix-tune-thresh: $(s)/debug/sorter/radix-tune-thresh.sh
+$(o)/ucw/sorter/debug/retros: $(o)/ucw/sorter/debug/retros.o $(LIBUCW)
+$(o)/ucw/sorter/debug/radix-file-test: $(o)/ucw/sorter/debug/radix-file-test.o $(LIBUCW)
+$(o)/ucw/sorter/debug/radix-asio-test: $(o)/ucw/sorter/debug/radix-asio-test.o $(LIBUCW)
+$(o)/ucw/sorter/debug/radix-tune-bits: $(s)/ucw/sorter/debug/radix-tune-bits.sh
+$(o)/ucw/sorter/debug/radix-tune-thresh: $(s)/ucw/sorter/debug/radix-tune-thresh.sh