The big move. Step #2: Updated all other references to lib/.

diff --git a/charset/charconv.c b/charset/charconv.c
index 54dac42b74383bb65cbe9b8ef1157b0824645804..bf431dd1b93569fdf68ade711848801c4e18aedf 100644 (file)
--- a/charset/charconv.c
+++ b/charset/charconv.c
@@ -8,9 +8,9 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/unicode.h"
-#include "lib/unaligned.h"
+#include "ucw/lib.h"
+#include "ucw/unicode.h"
+#include "ucw/unaligned.h"
 #include "charset/charconv.h"
 #include "charset/chartable.h"
 

diff --git a/charset/fb-charconv.c b/charset/fb-charconv.c
index 1d46005187f3f05e931e779b68cc9168ea81bf0e..c119a1bea87d55a3ee7855434d9b7b56263bfe40 100644 (file)
--- a/charset/fb-charconv.c
+++ b/charset/fb-charconv.c
@@ -7,8 +7,8 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"
 #include "charset/charconv.h"
 #include "charset/fb-charconv.h"
 

diff --git a/charset/mp-charconv.c b/charset/mp-charconv.c
index 7c18d40f90fee7255c8e3f75714189ddfe205331..ac60449563a1d402cc8bf922293092cc1e789f5c 100644 (file)
--- a/charset/mp-charconv.c
+++ b/charset/mp-charconv.c
@@ -7,7 +7,7 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/mp-charconv.h"
 #include <string.h>
 #include <alloca.h>

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index ab6f65d924f71708bf6723afb296c0ebe45558a6..97604983ea4320645ea74b594bf2e3d4963074e6 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -10,7 +10,7 @@
 #ifndef _CHARSET_MP_CHARCONV_H
 #define _CHARSET_MP_CHARCONV_H
 
-#include "lib/mempool.h"
+#include "ucw/mempool.h"
 #include "charset/charconv.h"
 
 byte *mp_strconv(struct mempool *mp, const byte *s, uns cs_in, uns cs_out);

diff --git a/charset/setnames.c b/charset/setnames.c
index ff723ec2c87c55d51a8365b6743dd365b2836d08..ac99fbd74000266dad39322c1cd5492945592613 100644 (file)
--- a/charset/setnames.c
+++ b/charset/setnames.c
@@ -8,7 +8,7 @@
  *     of the GNU General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/charconv.h"
 
 #include <string.h>

diff --git a/charset/stk-charconv.c b/charset/stk-charconv.c
index a40a7edb1e736f96c06a858f850ddcfe106a054b..853bd9db03c06607c5ed68b588baead2df77269f 100644 (file)
--- a/charset/stk-charconv.c
+++ b/charset/stk-charconv.c
@@ -7,7 +7,7 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/stk-charconv.h"
 #include <string.h>
 

diff --git a/charset/tocat.c b/charset/tocat.c
index 583c31ddf32df438c17848628373d5c8a57e4c9d..77f49d1519ca0d36eb2e33b0ce0da8d9b0b5d8d9 100644 (file)
--- a/charset/tocat.c
+++ b/charset/tocat.c
@@ -7,6 +7,6 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-cat.h"

diff --git a/charset/toligatures.c b/charset/toligatures.c
index 5fc9d07527f3d7131ecd85267b24ff177bbf4c8a..f12c572d193465db8f3fdfc55d7eadeaffd31e1b 100644 (file)
--- a/charset/toligatures.c
+++ b/charset/toligatures.c
@@ -7,7 +7,7 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-ligatures.h"
 

diff --git a/charset/tolower.c b/charset/tolower.c
index 189c3151267453d950b6eda0e1ae0ccca971ce4e..9c975044ee79ffe9bb66c0c9ab697a2d979ffb55 100644 (file)
--- a/charset/tolower.c
+++ b/charset/tolower.c
@@ -7,6 +7,6 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-lower.h"

diff --git a/charset/toupper.c b/charset/toupper.c
index 61301d9047c4919cb57ca1364309e14c9bc4bddf..5691d4e0b339a94554c6697f42e290b0331be535 100644 (file)
--- a/charset/toupper.c
+++ b/charset/toupper.c
@@ -7,6 +7,6 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-upper.h"

diff --git a/charset/unaccent.c b/charset/unaccent.c
index a5083e91a0d1ee8b960930f7f4d3eb8dac918e8c..9f7f79dcfe4dc94fd39b5bbaafa35e25b964dcb6 100644 (file)
--- a/charset/unaccent.c
+++ b/charset/unaccent.c
@@ -7,6 +7,6 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "charset/unicat.h"
 #include "charset/U-unacc.h"

diff --git a/debug/sorter/radix-asio-test.c b/debug/sorter/radix-asio-test.c
index 7858985d19790a8a9403156ec53d2005dfc9bc9b..f288c3be43a851bb44240f7aaab473774296ce14 100644 (file)
--- a/debug/sorter/radix-asio-test.c
+++ b/debug/sorter/radix-asio-test.c
@@ -4,10 +4,10 @@
  *  (c) 2007 Martin Mares <mj@ucw.cz>
  */
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/lfs.h"
-#include "lib/asio.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
+#include "ucw/lfs.h"
+#include "ucw/asio.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/debug/sorter/radix-file-test.c b/debug/sorter/radix-file-test.c
index d2cd386f697862dd0f320a141d940c824d7acad8..6d9de8ebf2926515d50b072833f0869b666ce4fe 100644 (file)
--- a/debug/sorter/radix-file-test.c
+++ b/debug/sorter/radix-file-test.c
@@ -4,9 +4,9 @@
  *  (c) 2007 Martin Mares <mj@ucw.cz>
  */
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/lfs.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
+#include "ucw/lfs.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/debug/sorter/radix-tune-bits.sh b/debug/sorter/radix-tune-bits.sh
index b835a8e71c882d6af602bb97e05611e79a163171..dbaa49c1a887d75240051287774be02002bf5ff4 100644 (file)
--- a/debug/sorter/radix-tune-bits.sh
+++ b/debug/sorter/radix-tune-bits.sh
@@ -7,7 +7,7 @@ UCW_PROGNAME="$0"
 
 # Path to Sherlock build directory
 [ -n "$BUILD" ] || BUILD=..
-[ -f "$BUILD/lib/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'
@@ -31,19 +31,19 @@ TESTS="2,5,8,15"
 # Check various bit widths of the radix sorter
 rm -f tmp/radix-*
 for W in $WIDTHS ; do
-       rm -f $BUILD/obj/lib/sorter/sort-test{,.o}
+       rm -f $BUILD/obj/ucw/sorter/sort-test{,.o}
        if [ $W = 0 ] ; then
                log "Compiling with no radix splits"
-               ( cd $BUILD && make obj/lib/sorter/sort-test )
+               ( cd $BUILD && make obj/ucw/sorter/sort-test )
                OPT="-d32"
        else
                log "Compiling with $W-bit radix splits"
-               ( cd $BUILD && make CEXTRA="-DFORCE_RADIX_BITS=$W" obj/lib/sorter/sort-test )
+               ( cd $BUILD && make CEXTRA="-DFORCE_RADIX_BITS=$W" obj/ucw/sorter/sort-test )
                OPT=
        fi
        for THR in $THRS ; do
                log "Testing with RadixThreshold=$THR"
-               $BUILD/obj/lib/sorter/sort-test -SThreads.DefaultStackSize=2M -SSorter.RadixThreshold=$THR -s$SIZE -t$TESTS $OPT -v 2>&1 | tee -a tmp/radix-$W
+               $BUILD/obj/ucw/sorter/sort-test -SThreads.DefaultStackSize=2M -SSorter.RadixThreshold=$THR -s$SIZE -t$TESTS $OPT -v 2>&1 | tee -a tmp/radix-$W
        done
 done
 

diff --git a/debug/sorter/radix-tune-thresh.sh b/debug/sorter/radix-tune-thresh.sh
index 1c75ed586e54f3a7f1ec581baa2842b349262c8e..71d929b3e316b841ec02d294f500295b3d301d43 100644 (file)
--- a/debug/sorter/radix-tune-thresh.sh
+++ b/debug/sorter/radix-tune-thresh.sh
@@ -7,7 +7,7 @@ UCW_PROGNAME="$0"
 
 # Path to Sherlock build directory
 [ -n "$BUILD" ] || BUILD=..
-[ -f "$BUILD/lib/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'
@@ -43,7 +43,7 @@ while [ $SIZE -gt 262144 ] ; do
        echo $SIZE >>tmp/radix-sizes
        for T in $THRS ; do
                log "Trying size $SIZE with threshold $T"
-               $BUILD/obj/lib/sorter/sort-test -SSorter.RadixThreshold=$T -s$SIZE -t$TEST -v 2>&1 | tee -a tmp/radix-$T
+               $BUILD/obj/ucw/sorter/sort-test -SSorter.RadixThreshold=$T -s$SIZE -t$TEST -v 2>&1 | tee -a tmp/radix-$T
        done
        SIZE=$(($SIZE/2))
 done

diff --git a/debug/sorter/retros.c b/debug/sorter/retros.c
index e85dfe853934e528ce344d2157bc27748c0f53ff..073cd8b078e32c94174494ccada181af56d97671 100644 (file)
--- a/debug/sorter/retros.c
+++ b/debug/sorter/retros.c
@@ -5,8 +5,8 @@
  */
 
 #include "sherlock/sherlock.h"
-#include "lib/getopt.h"
-#include "lib/md5.h"
+#include "ucw/getopt.h"
+#include "ucw/md5.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,13 +50,13 @@ static int comp_ind(const void *x, const void *y)
 #define ASORT_ELT(i) a[i].key
 #define ASORT_SWAP(i,j) do { struct elt t=a[i]; a[i]=a[j]; a[j]=t; } while (0)
 #define ASORT_EXTRA_ARGS , struct elt *a
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 #define ASORT_PREFIX(x) asi_##x
 #define ASORT_KEY_TYPE u32
 #define ASORT_ELT(i) ind[i]->key
 #define ASORT_SWAP(i,j) do { struct elt *t=ind[i]; ind[i]=ind[j]; ind[j]=t; } while (0)
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 static void r1_sort(void)
 {

diff --git a/free/libs/Makefile b/free/libs/Makefile
index a9ec173ddebd10d05256bd48bb37695ffa9c2a65..4c55eb9b47ac4e4bcf0de627347e16c0396740d8 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -21,7 +21,7 @@ LIBCHARSET=$(o)/charset/libcharset.pc
 LIBSH=$(o)/sherlock/libsh.pc
 
 # Include makefiles of libraries we wish to use
-include $(s)/lib/Makefile
+include $(s)/ucw/Makefile
 include $(s)/charset/Makefile
 include $(s)/sherlock/Makefile
 

diff --git a/free/libs/configure b/free/libs/configure
index be2aee08c841d67e59fadf22af703fec48262e68..3934fef4c34dba3cf7993a1f341629ec3fa101cb 100755 (executable)
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -7,7 +7,7 @@ use strict;
 
 our $srcdir;
 BEGIN {
-       my $pkgfile = "lib/wildmatch.c";
+       my $pkgfile = "ucw/wildmatch.c";
        if (!defined ($srcdir = $ENV{"SRCDIR"})) {
                if (-f $pkgfile) {
                        $srcdir=".";
@@ -17,15 +17,15 @@ BEGIN {
                        die "Don't know how to find myself. Please set SRCDIR manually.";
                }
        }
-       require "$srcdir/lib/perl/Configure.pm";
+       require "$srcdir/ucw/perl/Configure.pm";
        UCW::Configure::import UCW::Configure;
 }
 
 Init($srcdir, "default.cfg");
-Include "lib/default.cfg";
+Include "ucw/default.cfg";
 Log "### Configuring Sherlock Libraries " . Get("SHERLOCK_VERSION") . " with configuration " . Get("CONFIG") . "\n";
 Include Get("CONFIG");
-Include "lib/autoconf.cfg";
+Include "ucw/autoconf.cfg";
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";

diff --git a/free/libs/examples/external/test.c b/free/libs/examples/external/test.c
index 2a03b2912b11e6f851d540fa517473823fe6fd81..5c88e2f1824799d55478dcfdb96bf0080b33af29 100644 (file)
--- a/free/libs/examples/external/test.c
+++ b/free/libs/examples/external/test.c
@@ -1,4 +1,4 @@
-#include "lib/lib.h"
+#include "ucw/lib.h"
 
 int main(void)
 {

diff --git a/free/libs/examples/internal/Makefile b/free/libs/examples/internal/Makefile
index 628fe1487f5dba888651f644e069fcf0ce8b4a89..13286e534a2b50a10896c678cc24c5a8024299ce 100644 (file)
--- a/free/libs/examples/internal/Makefile
+++ b/free/libs/examples/internal/Makefile
@@ -19,7 +19,7 @@ LIBCHARSET=$(o)/charset/libcharset.pc
 LIBIMAGES=$(o)/images/libimages.pc
 
 # Include makefiles of libraries we wish to use
-include $(s)/lib/Makefile
+include $(s)/ucw/Makefile
 include $(s)/charset/Makefile
 include $(s)/lang/Makefile
 include $(s)/images/Makefile

diff --git a/free/libs/examples/internal/configure b/free/libs/examples/internal/configure
index e4b5f1003536d9cffe4987b242b2727162ee0030..1e93b7eabdff0c36ef762516df2b983c07c028ff 100755 (executable)
--- a/free/libs/examples/internal/configure
+++ b/free/libs/examples/internal/configure
@@ -7,7 +7,7 @@ use strict;
 
 our $srcdir;
 BEGIN {
-       my $pkgfile = "lib/wildmatch.c";
+       my $pkgfile = "ucw/wildmatch.c";
        if (!defined ($srcdir = $ENV{"SRCDIR"})) {
                if (-f $pkgfile) {
                        $srcdir=".";
@@ -17,15 +17,15 @@ BEGIN {
                        die "Don't know how to find myself. Please set SRCDIR manually.";
                }
        }
-       require "$srcdir/lib/perl/Configure.pm";
+       require "$srcdir/ucw/perl/Configure.pm";
        UCW::Configure::import UCW::Configure;
 }
 
 Init($srcdir, "default.cfg");
-Include "lib/default.cfg";
+Include "ucw/default.cfg";
 Log "### Configuring TestApp ###\n\n";
 Include Get("CONFIG");
-Include "lib/autoconf.cfg";
+Include "ucw/autoconf.cfg";
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";

diff --git a/free/libs/examples/internal/test.c b/free/libs/examples/internal/test.c
index 2a03b2912b11e6f851d540fa517473823fe6fd81..5c88e2f1824799d55478dcfdb96bf0080b33af29 100644 (file)
--- a/free/libs/examples/internal/test.c
+++ b/free/libs/examples/internal/test.c
@@ -1,4 +1,4 @@
-#include "lib/lib.h"
+#include "ucw/lib.h"
 
 int main(void)
 {

diff --git a/images/color-tool.c b/images/color-tool.c
index 112f7386d30b2d51ba51a43a107b9555c08b4ecd..1a59d2f9b0a241453f95bbfb4580a71abffb2d36 100644 (file)
--- a/images/color-tool.c
+++ b/images/color-tool.c
@@ -7,7 +7,7 @@
  *     of the GNU General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/color.h"
 

diff --git a/images/color.c b/images/color.c
index 041f90b36c4670a43e3cd1b63fff2828b395d349..0a9da8c4c7f526876cf2db780cced098d03791ef 100644 (file)
--- a/images/color.c
+++ b/images/color.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/error.h"

diff --git a/images/config.c b/images/config.c
index 8ece456d2ea606623f4d1e3f8abf72f482aa6d06..c3a5855e71ec73a0b452cc7ec9b645c83e9f7b87 100644 (file)
--- a/images/config.c
+++ b/images/config.c
@@ -6,8 +6,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/conf.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
 #include "images/images.h"
 #if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
 #include "images/signature.h"

diff --git a/images/context.c b/images/context.c
index baebb9b8d53d34c20d14a69f97dd524a877f0f83..13ce4b8c9883bbb17e247f4959af48a3b2430d2c 100644 (file)
--- a/images/context.c
+++ b/images/context.c
@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/bbuf.h"
+#include "ucw/lib.h"
+#include "ucw/bbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 

diff --git a/images/dup-cmp.c b/images/dup-cmp.c
index b71feaef9fa871fc4e4ff8675b593e956e9604ea..e16f0634c2b3ff82f6bbf4d9423bf0df6bfb0e84 100644 (file)
--- a/images/dup-cmp.c
+++ b/images/dup-cmp.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/duplicates.h"
 

diff --git a/images/dup-init.c b/images/dup-init.c
index ea886d0955298b4a26080e1a1768fcbaa3021bc2..4900af5101f9b80cb3ca252f947e25cfbac26225 100644 (file)
--- a/images/dup-init.c
+++ b/images/dup-init.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/duplicates.h"

diff --git a/images/image-dup-test.c b/images/image-dup-test.c
index 93fde378819e8573df42257a6fe7cb68fd65b775..7e1916cb6dfd47a72d20535facc18b2cdb7a2144 100644 (file)
--- a/images/image-dup-test.c
+++ b/images/image-dup-test.c
@@ -7,10 +7,10 @@
  *     of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
-#include "lib/mempool.h"
+#include "ucw/lib.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
+#include "ucw/mempool.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/duplicates.h"

diff --git a/images/image-sim-test.c b/images/image-sim-test.c
index 52309bdb82a317c4fb7034d341ad921b29220806..ed43e0f2d6f24dd5aff474a28d0022b369bb6878 100644 (file)
--- a/images/image-sim-test.c
+++ b/images/image-sim-test.c
@@ -7,11 +7,11 @@
  *     of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
-#include "lib/base64.h"
-#include "lib/base224.h"
+#include "ucw/lib.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
+#include "ucw/base64.h"
+#include "ucw/base224.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/signature.h"

diff --git a/images/image-test.c b/images/image-test.c
index 889e85e5270958edd87fc114b22e8e635dddba56..4bf02b3992d742c997c3dc9b37c15a8c33632577 100644 (file)
--- a/images/image-test.c
+++ b/images/image-test.c
@@ -9,10 +9,10 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
-#include "lib/threads.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
+#include "ucw/threads.h"
 #include "images/images.h"
 #include "images/color.h"
 

diff --git a/images/image-tool.c b/images/image-tool.c
index b211f1969852a999ef52777a8c22a9db8ef2b1a9..1984906e97de6c6f948a6022b64d744da7a19a75 100644 (file)
--- a/images/image-tool.c
+++ b/images/image-tool.c
@@ -7,8 +7,8 @@
  *     of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/color.h"
 

diff --git a/images/image.c b/images/image.c
index 058b173e9abf192261ae8ef5d800fa833c2ba361..c741d3960c60301d61c97ac580402db36e146ce5 100644 (file)
--- a/images/image.c
+++ b/images/image.c
@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"

diff --git a/images/images.h b/images/images.h
index 34ba1ad961823b1534f2fbb459e9ff1bbee18a1e..d555ce529f3b48094b92dcd18f981f1b35c87716 100644 (file)
--- a/images/images.h
+++ b/images/images.h
@@ -10,7 +10,7 @@
 #ifndef _IMAGES_IMAGES_H
 #define _IMAGES_IMAGES_H
 
-#include "lib/bbuf.h"
+#include "ucw/bbuf.h"
 
 struct mempool;
 struct fastbuf;

diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c
index be394c95b393a9152fe300c60bd1adbdc9391e30..16f10b7a46ef3f39853089d948e0b9646bbb9bd9 100644 (file)
--- a/images/io-libjpeg.c
+++ b/images/io-libjpeg.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"

diff --git a/images/io-libmagick.c b/images/io-libmagick.c
index 60d3615941c0330fa7fa833670ea394f5ef54026..1a636b2a29ad7b9c53ec3e91c4fb8db21f7d4f4a 100644 (file)
--- a/images/io-libmagick.c
+++ b/images/io-libmagick.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"

diff --git a/images/io-libpng.c b/images/io-libpng.c
index afec24a0141c2c36570f16c11fd8c7ee3e08d88f..081ca35f45ec3ece58ff7c08a4fca7de9e872c26 100644 (file)
--- a/images/io-libpng.c
+++ b/images/io-libpng.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"

diff --git a/images/io-libungif.c b/images/io-libungif.c
index c20c9f58d0fe65627607f3feae112a5e3c610d1b..ac0f51f29b4e94a2892264dbce61e35f9163e93e 100644 (file)
--- a/images/io-libungif.c
+++ b/images/io-libungif.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"

diff --git a/images/io-main.c b/images/io-main.c
index f69b8b6c4a4bf926706f365c36cbbd5f2d6f3dc1..c2975842c3e7076b2e4e8162250c865a39c4d660 100644 (file)
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/io-main.h"

diff --git a/images/math.c b/images/math.c
index f88daa60f6a783b3bad1ff3e6b2bebd36c88d50c..393fed0fc95b6a04b787996ca0b71c4f569723fb 100644 (file)
--- a/images/math.c
+++ b/images/math.c
@@ -7,7 +7,7 @@
  *     of the GNU General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/math.h"
 
 const u32 fast_div_tab[] = {

diff --git a/images/object.c b/images/object.c
index 7138aa954f703d7a1ee0d73b34660ff54c489db2..9133b7e6d8ff16e4d74f631ad6e12088478caf34 100644 (file)
--- a/images/object.c
+++ b/images/object.c
@@ -9,9 +9,9 @@
 #undef LOCAL_DEBUG
 
 #include "sherlock/sherlock.h"
-#include "lib/base224.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/base224.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "sherlock/object.h"
 #include "images/images.h"
 #include "images/object.h"

diff --git a/images/scale.c b/images/scale.c
index 6be72ca241202245cd956ec18eb312e993f7f964..41fda01d5be4c158b597c0fd1cbac4cec7830710 100644 (file)
--- a/images/scale.c
+++ b/images/scale.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/math.h"

diff --git a/images/sig-cmp.c b/images/sig-cmp.c
index c663c2b3edc56afd1c0db7afb9606b3b7538d3dc..028e1b6ac56288cfeb7b3d2e06548e1381094a6e 100644 (file)
--- a/images/sig-cmp.c
+++ b/images/sig-cmp.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/math.h"
 #include "images/images.h"
 #include "images/signature.h"
@@ -20,7 +20,7 @@
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) items[i]
 #define ASORT_EXTRA_ARGS , uns *items
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 #define EXPLAIN
 #include "images/sig-cmp-gen.h"

diff --git a/images/sig-dump.c b/images/sig-dump.c
index a150f612dab4f271f18f289c9af431d01cc29072..4a7bdf2ac4cb9a35e2b48a13f1087eafe9f39462 100644 (file)
--- a/images/sig-dump.c
+++ b/images/sig-dump.c
@@ -7,7 +7,7 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include <stdio.h>

diff --git a/images/sig-init.c b/images/sig-init.c
index 60b53350548ee642554565df51f3521d475d33fa..34089216881b9df21dda913d211bc891ab49c087 100644 (file)
--- a/images/sig-init.c
+++ b/images/sig-init.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/fastbuf.h"
-#include "lib/conf.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"
+#include "ucw/conf.h"
 #include "images/images.h"
 #include "images/math.h"
 #include "images/error.h"

diff --git a/images/sig-seg.c b/images/sig-seg.c
index 8deeca91677d98ebec30b70ce48183885ba285e6..b82c6ccd232173e701dd359f1719856a14c22f8b 100644 (file)
--- a/images/sig-seg.c
+++ b/images/sig-seg.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/heap.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
+#include "ucw/heap.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include "images/math.h"
@@ -95,7 +95,7 @@ prequant_heap_cmp(struct image_sig_region *a, struct image_sig_region *b)
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) val[i]
 #define ASORT_EXTRA_ARGS , uns *val
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 static uns
 prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_region *regions)

diff --git a/images/sig-txt.c b/images/sig-txt.c
index 1e2a9cd31e41c326e3c1afa901b3ea005d2c3b35..2e20f0710352592fcda24e62d68bb5c99904f018 100644 (file)
--- a/images/sig-txt.c
+++ b/images/sig-txt.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include "images/math.h"

diff --git a/sherlock/xml/common.c b/sherlock/xml/common.c
index aca3435395caba5d612254bd75c286d9e8ef5d05..6bb2737f670dd1b1f05a028058e4405b1c0b9331 100644 (file)
--- a/sherlock/xml/common.c
+++ b/sherlock/xml/common.c
@@ -13,8 +13,8 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/stkstring.h"
-#include "lib/ff-unicode.h"
+#include "ucw/stkstring.h"
+#include "ucw/ff-unicode.h"
 
 #include <setjmp.h>
 

diff --git a/sherlock/xml/dtd.c b/sherlock/xml/dtd.c
index 8c50a53265785502445376e1f27bebc46a8d43ac..67cb7ccca08b1638eb576824f7e695ca2eae7879 100644 (file)
--- a/sherlock/xml/dtd.c
+++ b/sherlock/xml/dtd.c
@@ -13,9 +13,9 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/fastbuf.h"
-#include "lib/ff-unicode.h"
-#include "lib/unicode.h"
+#include "ucw/fastbuf.h"
+#include "ucw/ff-unicode.h"
+#include "ucw/unicode.h"
 
 /* Notations */
 
@@ -29,7 +29,7 @@
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 struct xml_dtd_notn *
 xml_dtd_find_notn(struct xml_context *ctx, char *name)
@@ -51,7 +51,7 @@ xml_dtd_find_notn(struct xml_context *ctx, char *name)
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 static struct xml_dtd_entity *
 xml_dtd_declare_trivial_entity(struct xml_context *ctx, char *name, char *text)
@@ -155,7 +155,7 @@ xml_dtd_elems_init_data(struct xml_dtd_elems_table *tab UNUSED, struct xml_dtd_e
 #define HASH_GIVE_INIT_DATA
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 struct xml_dtd_elem *
 xml_dtd_find_elem(struct xml_context *ctx, char *name)
@@ -200,7 +200,7 @@ xml_dtd_enodes_init_key(struct xml_dtd_enodes_table *tab UNUSED, struct xml_dtd_
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 /* Element attributes */
 
@@ -240,7 +240,7 @@ xml_dtd_attrs_init_key(struct xml_dtd_attrs_table *tab UNUSED, struct xml_dtd_at
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 struct xml_dtd_attr *
 xml_dtd_find_attr(struct xml_context *ctx, struct xml_dtd_elem *elem, char *name)
@@ -284,7 +284,7 @@ xml_dtd_evals_init_key(struct xml_dtd_evals_table *tab UNUSED, struct xml_dtd_ev
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 /* Enumerated attribute notations */
 
@@ -322,7 +322,7 @@ xml_dtd_enotns_init_key(struct xml_dtd_enotns_table *tab UNUSED, struct xml_dtd_
 #define HASH_GIVE_ALLOC
 #define HASH_TABLE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 /* DTD initialization/cleanup */
 

diff --git a/sherlock/xml/parse.c b/sherlock/xml/parse.c
index 5581ed597cc70dce2297d770144aa33bd065e24d..27141b142287c973d7385a9a30c37d9df9bed16f 100644 (file)
--- a/sherlock/xml/parse.c
+++ b/sherlock/xml/parse.c
@@ -13,11 +13,11 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/fastbuf.h"
-#include "lib/ff-unicode.h"
-#include "lib/unicode.h"
-#include "lib/chartype.h"
-#include "lib/hashfunc.h"
+#include "ucw/fastbuf.h"
+#include "ucw/ff-unicode.h"
+#include "ucw/unicode.h"
+#include "ucw/chartype.h"
+#include "ucw/hashfunc.h"
 
 #include <setjmp.h>
 
@@ -622,7 +622,7 @@ xml_attrs_init_key(struct xml_attrs_table *t UNUSED, struct xml_attr *a, struct
 #define HASH_WANT_FIND
 #define HASH_GIVE_ALLOC
 XML_HASH_GIVE_ALLOC
-#include "lib/hashtable.h"
+#include "ucw/hashtable.h"
 
 static void
 xml_parse_attr(struct xml_context *ctx)

diff --git a/sherlock/xml/source.c b/sherlock/xml/source.c
index 3b06f510b41c7b9a896969a3963d9662dfac05ee..29226f0fa062c086667980cdd2cb7fb25ea00456 100644 (file)
--- a/sherlock/xml/source.c
+++ b/sherlock/xml/source.c
@@ -13,8 +13,8 @@
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
 #include "sherlock/xml/internals.h"
-#include "lib/unicode.h"
-#include "lib/ff-unicode.h"
+#include "ucw/unicode.h"
+#include "ucw/ff-unicode.h"
 #include "charset/charconv.h"
 #include "charset/fb-charconv.h"
 

diff --git a/sherlock/xml/xml-test.c b/sherlock/xml/xml-test.c
index 0c685d8f612f9bcb9d65b24d67f5ade388a0a6cd..f6738c56db4164cd3851dfdd7c7351ebeac88812 100644 (file)
--- a/sherlock/xml/xml-test.c
+++ b/sherlock/xml/xml-test.c
@@ -10,8 +10,8 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/xml/xml.h"
 #include "sherlock/xml/dtd.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/sherlock/xml/xml.h b/sherlock/xml/xml.h
index 350fce9afd560444fdd601cca2e041afbcec88ed..e94588836bf733470c2d008725d08b06fa140252 100644 (file)
--- a/sherlock/xml/xml.h
+++ b/sherlock/xml/xml.h
@@ -10,10 +10,10 @@
 #ifndef _SHERLOCK_XML_XML_H
 #define _SHERLOCK_XML_XML_H
 
-#include "lib/clists.h"
-#include "lib/slists.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/clists.h"
+#include "ucw/slists.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 
 struct xml_context;
 struct xml_dtd_entity;