Charset: compile cs2cs

diff --git a/TODO b/TODO
index ff88ed25237955e2d1db2ddac6b4dd5156b155d3..228fdde1195f33db5d2f5fa0a31e02a0139d56fa 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,6 +3,3 @@
 - lfs-test: generalize or kill
 - transactions: Unit tests
 - libucw.pc: do not use -l if shared
-- compile cstocs
-- retros.c: sherlock.h
-- remove excess inlines

diff --git a/charset/Makefile b/charset/Makefile
index 23d40f8c8e896cf52b7e166ab30e5d294eb08862..32cc82a7637102008980eb58efa37daf6dced645 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -20,6 +20,12 @@ $(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
 $(o)/charset/.include-stamp: IDST=charset
 run/lib/pkgconfig/libcharset.pc: $(o)/charset/libcharset.pc
 
+ifdef CONFIG_CHARSET_UTILS
+PROGS+=$(o)/charset/cs2cs
+endif
+
+$(o)/charset/cs2cs: $(o)/charset/cs2cs.o $(LIBUCW) $(o)/charset/libcharset.pc
+
 build_charsets:
        cd $(s)/charset && sh misc/generate
 

diff --git a/charset/cs2cs.c b/charset/cs2cs.c
index 1ec48a1834223e974b1bd475e5e6461eac39c992..4f2a97bb6f8844803f23c2e93dd7e3f4e715c83e 100644 (file)
--- a/charset/cs2cs.c
+++ b/charset/cs2cs.c
@@ -8,7 +8,7 @@
  *     of the GNU General Public License.
  */
 
-#include "sherlock/sherlock.h"
+#include <ucw/lib.h>
 #include <charset/charconv.h>
 
 #include <stdlib.h>

diff --git a/default.cfg b/default.cfg
index f6e25e3b35c336962083d837f1f3e9c58018e518..90667f3ff402da70d152c9b85524eb5747e97e11 100644 (file)
--- a/default.cfg
+++ b/default.cfg
@@ -30,6 +30,7 @@ UnSet("CONFIG_IMAGES_LIBMAGICK");
 
 # Libcharset
 Set("CONFIG_CHARSET");
+Set("CONFIG_CHARSET_UTILS");
 
 # Libshxml
 Set("CONFIG_SHXML");