From: Martin Mares <mj@ucw.cz>
Date: Sat, 11 Feb 2012 20:36:08 +0000 (+0100)
Subject: Charset: compile cs2cs
X-Git-Tag: v5.0~37
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=838aa7b53f746f58233825ee64528c8fc9b490e6;p=libucw.git

Charset: compile cs2cs
---

diff --git a/TODO b/TODO
index ff88ed25..228fdde1 100644
--- 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 23d40f8c..32cc82a7 100644
--- 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 1ec48a18..4f2a97bb 100644
--- 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 f6e25e3b..90667f3f 100644
--- 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");